Delete logo_purple.png

.gitignore

@@ -13,7 +13,7 @@ $RECYCLE.BIN/
 app/less/*.css
 dist/
 node_modules/
-tmp/
+pkg/tmp/
 pkg/*.nupkg
 pkg/*.zip
 
@@ -23,7 +23,6 @@ pkg/*.zip
 [Bb]in/
 [Oo]bj/
 [Pp]ackages/
-VersionInfo.cs
 
 *.aps
 *.bak

Gruntfile.js

@@ -1,216 +0,0 @@
-module.exports = function(grunt) {
-  require('load-grunt-tasks')(grunt);
-  var path = require('path')
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    pkgMeta: grunt.file.readJSON('config/meta.json'),
-    dest: grunt.option('target') || 'dist',
-    basePath: path.join('<%= dest %>', 'App_Plugins', '<%= pkgMeta.name %>'),
-
-    watch: {
-      options: {
-        spawn: false,
-        atBegin: true
-      },
-
-      less: {
-        files: ['app/**/*.less'],
-        tasks: ['less:dist']
-      },
-
-      js: {
-        files: ['app/**/*.js'],
-        tasks: ['concat:dist']
-      },
-
-      html: {
-        files: ['app/**/*.html'],
-        tasks: ['copy:html']
-      },
-
-      dll: {
-        files: ['app/Umbraco/**/*.dll'],
-        tasks: ['copy:dll']
-      }
-    },
-
-    less: {
-      dist: {
-        options: {
-          paths: ["app/less", "lib/less", "vendor"],
-        },
-        files: {
-          '<%= basePath %>/css/archetype.css': 'app/less/archetype.less',
-        }
-      }
-    },
-
-    concat: {
-      options: {
-        stripBanners: false
-      },
-      dist: {
-        src: [
-          'app/controllers/controller.js',
-          'app/controllers/config.controller.js',
-          'app/directives/archetypeproperty.js',
-          'app/directives/archetypecustomview.js',
-          'app/directives/localize.js',
-          'app/services/localization.js',
-          'app/resources/propertyeditor.js'
-        ],
-        dest: '<%= basePath %>/js/archetype.js'
-      }
-    },
-
-    copy: {
-      html: {
-        cwd: 'app/views/',
-        src: ['archetype.html', 'archetype.default.html', 'archetype.config.html'],
-        dest: '<%= basePath %>/views',
-        expand: true
-      },
-      dll: {
-        cwd: 'app/Umbraco/Umbraco.Archetype/bin/Release/',
-        src: 'Archetype.dll',
-        dest: '<%= dest %>/bin/',
-        expand: true
-      },
-      config: {
-        files: [
-          {
-            cwd: 'app/langs/',
-            src: ['**'],
-            dest: '<%= basePath %>/langs',
-            expand: true
-          }
-        ]
-      },
-      nuget: {
-        files: [
-          {
-            cwd: '<%= dest %>',
-            src: ['**/*', '!bin', '!bin/*'],
-            dest: 'tmp/nuget/content',
-            expand: true
-          },
-          {
-            cwd: '<%= dest %>/bin',
-            src: ['*.dll'],
-            dest: 'tmp/nuget/lib/net40',
-            expand: true
-          }
-        ]
-      },
-      umbraco: {
-        cwd: '<%= dest %>',
-        src: '**/*',
-        dest: 'tmp/umbraco',
-        expand: true
-      }
-    },
-
-    nugetpack: {
-    	dist: {
-    		src: 'tmp/nuget/package.nuspec',
-    		dest: 'pkg'
-    	}
-    },
-
-    template: {
-    	'nuspec': {
-			'options': {
-    			'data': { 
-            name: '<%= pkgMeta.name %>',
-    				version: '<%= pkgMeta.version %>',
-            url: '<%= pkgMeta.url %>',
-            license: '<%= pkgMeta.license %>',
-            licenseUrl: '<%= pkgMeta.licenseUrl %>',
-            author: '<%= pkgMeta.author %>',
-            authorUrl: '<%= pkgMeta.authorUrl %>',
-
-    				files: [{ path: 'tmp/nuget/**', target: 'content/App_Plugins/Archetype'}]
-	    		}
-    		},
-    		'files': { 
-    			'tmp/nuget/package.nuspec': ['config/package.nuspec']
-    		}
-    	}
-    },
-
-    umbracoPackage: {
-      options: {
-        name: "<%= pkgMeta.name %>",
-        version: '<%= pkgMeta.version %>',
-        url: '<%= pkgMeta.url %>',
-        license: '<%= pkgMeta.license %>',
-        licenseUrl: '<%= pkgMeta.licenseUrl %>',
-        author: '<%= pkgMeta.author %>',
-        authorUrl: '<%= pkgMeta.authorUrl %>',
-        manifest: 'config/package.xml',
-        readme: 'config/readme.txt',
-        sourceDir: 'tmp/umbraco',
-        outputDir: 'pkg',
-      }
-    },
-
-    clean: {
-      build: '<%= grunt.config("basePath").substring(0, 4) == "dist" ? "dist/**/*" : "null" %>',
-      tmp: ['tmp']
-    },
-
-    assemblyinfo: {
-      options: {
-        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
-        filename: 'VersionInfo.cs',
-        info: {
-          version: '<%= (pkgMeta.version.indexOf("-") ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 
-          fileVersion: '<%= pkgMeta.version %>'
-        }
-      }
-    },
-
-    touch: {
-      webconfig: {
-        src: ['<%= grunt.option("target") %>\\Web.config']
-      }
-    },
-
-    jshint: {
-      options: {
-        jshintrc: '.jshintrc'
-      },
-      src: {
-        src: ['app/**/*.js', 'lib/**/*.js']
-      }
-    },
-
-    msbuild: {
-      options: {
-        stdout: true,
-        verbosity: 'quiet',
-        maxCpuCount: 4,
-		version: 4.0,
-        buildParameters: {
-          WarningLevel: 2,
-          NoWarn: 1607
-        }
-      },
-      dist: {
-        src: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj'],
-        options: {
-          projectConfiguration: 'Release',
-          targets: ['Clean', 'Rebuild'],
-        }
-      }
-    }
-
-  });
-
-  grunt.registerTask('default', ['clean', 'less', 'concat', 'assemblyinfo', 'msbuild:dist', 'copy:dll', 'copy:config', 'copy:html']);
-
-  grunt.registerTask('nuget',   ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'clean:tmp']);
-  grunt.registerTask('umbraco', ['clean:tmp', 'default', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
-  grunt.registerTask('package', ['clean:tmp', 'default', 'copy:nuget', 'template:nuspec', 'nugetpack', 'copy:umbraco', 'umbracoPackage', 'clean:tmp']);
-};

LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Imulus
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,39 +0,0 @@
-Archetype
-=========
-![alt tag](http://imulus.github.io/Archetype/images/logo.png)
-
-![alt tag](http://imulus.github.io/Archetype/images/example1.png)
-
-## Installation
-Install the selected <a href='https://github.com/imulus/Archetype/releases'>release</a> through the Umbraco package installer or via <a href='http://www.nuget.org/packages/Archetype/'>NuGet</a>.
-
-
-## Official Docs ##
-http://imulus.github.io/Archetype
-
-Follow us on Twitter https://twitter.com/ArchetypeKit
-
-## Contribute ##
-
-Want to contribute to Archetype?  You'll want to use Grunt (our task runner) to help you integrate with a local copy of Umbraco.
-
-### Install Dependencies ###
-*Requires Node.js to be installed and in your system path*
-
-    npm install -g grunt-cli && npm install -g grunt
-    npm install
-
-### Build ###
-    grunt
-
-   Builds the project to `/dist/`.  These files can be dropped into an Umbraco 7 site, or you can build directly to a site using:
-
-    grunt --target="D:\inetpub\mysite"
-
-You can also watch for changes using:
-
-    grunt watch
-    grunt watch --target="D:\inetpub\mysite"
-
-
-Add `--touch` to either command to automatically touch the web.config on a deploy

app/Umbraco/.nuget/NuGet.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>

app/Umbraco/.nuget/NuGet.targets

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">true</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">false</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-        
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>

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

@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Archetype.Tests</RootNamespace>
-    <AssemblyName>Archetype.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AutoMapper">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoMapper.Net4">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
-    </Reference>
-    <Reference Include="businesslogic, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core">
-      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc">
-      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="cms, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
-    </Reference>
-    <Reference Include="controls, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
-    </Reference>
-    <Reference Include="CookComputing.XmlRpcV2">
-      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
-    </Reference>
-    <Reference Include="Examine, Version=0.1.55.2941, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
-    </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor.Web, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="interfaces, Version=1.0.5242.22737, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Lucene.Net">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
-    </Reference>
-    <Reference Include="MiniProfiler">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLCE4Umbraco, Version=1.0.5242.22741, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Core, Version=1.0.5242.22738, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.DataLayer, Version=1.0.5242.22740, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.editorControls, Version=1.0.5242.22746, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.MacroEngines, Version=1.0.5242.22747, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.providers, Version=1.0.5242.22742, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=1.0.5242.22748, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.XmlSerializers, Version=1.0.5242.22743, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
-    </Reference>
-    <Reference Include="UmbracoExamine, Version=0.6.0.22741, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
-    </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <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">
-      <Project>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</Project>
-      <Name>Archetype.Umbraco</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>xcopy  $(ProjectDir)SupportingFiles\config\* $(TargetDir)config /I /O /X /E /K /D /Y</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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

app/Umbraco/Archetype.Tests/Data/sample-1.json

@@ -1 +0,0 @@
-{"fieldsets":[{"alias":"archUi","properties":[{"alias":"blurb","value":"A blurb here"},{"alias":"boxHeadline","value":"Box 1 Title"},{"alias":"link","value":"3175"},{"alias":"show","value":"1"}],"remove":false,"collapse":true,"isValid":true},{"alias":"archUi","properties":[{"alias":"boxHeadline","value":"Another Box"},{"alias":"blurb","value":"Some content"},{"alias":"link","value":"3175"},{"alias":"show","value":"0"}],"remove":false,"collapse":true,"isValid":true}]}

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

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-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
-{
-
-    [TestFixture]
-    public class FieldsetTests
-    {
-
-        private string _sampleJson;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
-        }
-
-        [Test]
-        public void Can_Get_Fieldset_Property_By_Alias()
-        {
-            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
-
-            var fieldset = result.Fieldsets.First();
-            var propertyValue = fieldset.GetValue("boxHeadline");
-
-            Assert.That(propertyValue == "Box 1 Title");
-        }
-
-        [Test]
-        public void Can_Get_Fieldset_Property_Default_Value_By_Alias() 
-		{
-            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
-
-            var fieldset = result.Fieldsets.First();
-            var propertyValue = fieldset.GetValue<string>("noSuchProperty", "noSuchProperty default value");
-
-            Assert.That(propertyValue == "noSuchProperty default value");
-        }
-
-        [Test]
-        public void Can_Convert_Property_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>("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()
-        {
-            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
-
-            var fieldset = result.Fieldsets.First();
-
-            var property = fieldset.GetValue("link");
-            Assert.That(property is string);
-            Assert.That(property == "3175");
-        }
-
-    }
-}

app/Umbraco/Archetype.Tests/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Archetype.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Archetype.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("de11df59-e1eb-4aae-87fd-59c33606a1f5")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Archetype.PropertyConverters;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Models.PublishedContent;
-
-namespace Archetype.Tests.PropertyValueConverter
-{
-    [TestFixture]
-    public class PropertyValueConverterTests
-    {
-
-        private string _sampleJson;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _sampleJson = File.ReadAllText("..\\..\\Data\\sample-1.json");
-        }
-
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        public void Returns_Empty_Archetype_When_Data_Is_Null_Or_Empty(object data)
-        {
-            var converter = new ArchetypeValueConverter();
-            var result = converter.ConvertDataToSource(null, data, false);
-
-            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
-
-            var fieldsets = (Archetype.Models.ArchetypeModel) result;
-            Assert.IsTrue(fieldsets.Count() == 0);
-        }
-
-        [Test]
-        public void Returns_Empty_Archetype_When_Data_Is_Invalid_Json()
-        {
-            var data = "{ invalid";
-            var converter = new ArchetypeValueConverter();
-            var result = converter.ConvertDataToSource(null, data, false);
-            
-            Assert.AreEqual(result.GetType(), typeof (Archetype.Models.ArchetypeModel));
-
-            var fieldsets = (Archetype.Models.ArchetypeModel) result;
-            Assert.IsTrue(fieldsets.Count() == 0);
-        }
-
-        [Test]
-        public void Can_Serialize_From_Json_Model()
-        {
-            var converter = new ArchetypeValueConverter();
-            var result = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, _sampleJson, false);
-
-            Assert.That(result != null);
-            Assert.That(result.Fieldsets.Count() == 2);
-        }
-    }
-}

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/Archetype.Tests/app.config

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <configSections>
-      <sectionGroup name="umbracoConfiguration">
-        <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
-      </sectionGroup>
-    </configSections>
-    <umbracoConfiguration>
-      <settings configSource="config\umbracoSettings.config" />
-    </umbracoConfiguration>
-    <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

app/Umbraco/Archetype.Tests/packages.config

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
-  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
-</packages>

app/Umbraco/DatabaseSizer/Application.cs

@@ -1,49 +0,0 @@
-using System;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-
-namespace DatabaseSizer
-{
-    public class Application : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            base.ApplicationStarted(umbracoApplication, applicationContext);
-
-            ExpandPrevalueValueColumnSize();
-        }
-
-        protected void ExpandPrevalueValueColumnSize()
-        {
-            try
-            {
-                var dbContext = ApplicationContext.Current.DatabaseContext;
-                var colCount =
-                    dbContext.Database.ExecuteScalar<int>(
-                        "SELECT COUNT(1) FROM INFORMATION_SCHEMA.COLUMNS WHERE DATA_TYPE = 'nvarchar' AND COLUMN_NAME = 'value' AND CHARACTER_MAXIMUM_LENGTH = 2500 AND TABLE_NAME = 'cmsDataTypePreValues'");
-
-                // Check column
-                if (colCount != 0)
-                {
-                    using (var trans = dbContext.Database.GetTransaction())
-                    {
-                        // Change column
-                        dbContext.Database.Execute("ALTER TABLE [cmsDataTypePreValues] ALTER COLUMN [value] ntext NULL;");
-
-                        trans.Complete();
-                    }
-
-                    LogHelper.Debug(typeof(Application), "Successfully expanded Prevalue table Value column");
-                }
-                else
-                {
-                    LogHelper.Debug(typeof(Application), "Prevalue table Value column is already expanded");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error(typeof(Application), "Error expanding Prevalue table Value column", ex);
-            }
-        }
-    }
-}

app/Umbraco/DatabaseSizer/DatabaseSizer.csproj

@@ -1,213 +0,0 @@
-<?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>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0114C963-C514-49C1-B7AB-DCB1825F498C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DatabaseSizer</RootNamespace>
-    <AssemblyName>DatabaseSizer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AutoMapper">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoMapper.Net4">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
-    </Reference>
-    <Reference Include="businesslogic">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core">
-      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc">
-      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="cms">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
-    </Reference>
-    <Reference Include="controls">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
-    </Reference>
-    <Reference Include="CookComputing.XmlRpcV2">
-      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
-    </Reference>
-    <Reference Include="Examine">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
-    </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor">
-      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor.Web">
-      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="interfaces">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Lucene.Net">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Helpers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
-    </Reference>
-    <Reference Include="MiniProfiler">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLCE4Umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.DataLayer">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.editorControls">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.MacroEngines">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.providers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Web.UI">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
-    </Reference>
-    <Reference Include="umbraco.XmlSerializers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
-    </Reference>
-    <Reference Include="UmbracoExamine">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
-    </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Application.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

app/Umbraco/DatabaseSizer/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DatabaseSizer.cs")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DatabaseSizer.cs")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("28dc35d2-3dfb-40b4-9093-bc47c91127ea")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

app/Umbraco/DatabaseSizer/app.config

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

app/Umbraco/DatabaseSizer/packages.config

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
-  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
-</packages>

app/Umbraco/Umbraco.Archetype.sln

@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Umbraco", "Umbraco.Archetype\Archetype.Umbraco.csproj", "{7D185D41-4228-4978-ACB8-83F9A48AD94F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4ED-85A6-484F-9E72-BE7AC9835821}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseSizer", "DatabaseSizer\DatabaseSizer.csproj", "{0114C963-C514-49C1-B7AB-DCB1825F498C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs

@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System;
-using System.Linq;
-using System.Net;
-using System.Web.Http;
-using AutoMapper;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.Editors;
-
-namespace Archetype.Api
-{
-    [PluginController("ArchetypeApi")]
-    public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController
-    {
-
-        public IEnumerable<object> GetAllPropertyEditors()
-        {
-            return
-                global::Umbraco.Core.PropertyEditors.PropertyEditorResolver.Current.PropertyEditors
-                    .Select(x => new {defaultPreValues = x.DefaultPreValues, alias = x.Alias, view = x.ValueEditor.View});
-        }
-
-        public object GetAll() 
-        {
-            var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions();
-            return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
-        }
-
-        public object GetByGuid(Guid guid)
-        {
-            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
-            if (dataType == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
-            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
-        }
-    }
-}

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

@@ -1,266 +0,0 @@
-<?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>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7D185D41-4228-4978-ACB8-83F9A48AD94F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Archetype</RootNamespace>
-    <AssemblyName>Archetype</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AutoMapper">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AutoMapper.Net4">
-      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="businesslogic">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ClientDependency.Core">
-      <HintPath>..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc">
-      <HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="cms">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="controls">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="CookComputing.XmlRpcV2">
-      <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Examine">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HtmlAgilityPack">
-      <HintPath>..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ImageProcessor">
-      <HintPath>..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ImageProcessor.Web">
-      <HintPath>..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="interfaces">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Lucene.Net">
-      <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationBlocks.Data">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Helpers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Mvc.FixedDisplayModes">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MiniProfiler">
-      <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MySql.Data">
-      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SQLCE4Umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TidyNet">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.DataLayer">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.editorControls">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.MacroEngines">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.providers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Umbraco.Web.UI">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="umbraco.XmlSerializers">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UmbracoExamine">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Api\ArchetypeDataTypeController.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="Events\ExpireCache.cs" />
-    <Compile Include="Extensions\ArchetypeHelper.cs" />
-    <Compile Include="Extensions\Extensions.cs" />
-    <Compile Include="Models\ArchetypeModel.cs" />
-    <Compile Include="Models\ArchetypePreValue.cs" />
-    <Compile Include="Models\ArchetypePreValueFieldset.cs" />
-    <Compile Include="Models\ArchetypePreValueProperty.cs" />
-    <Compile Include="Models\ArchetypeFieldsetModel.cs" />
-    <Compile Include="Models\ArchetypePropertyModel.cs" />
-    <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" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

app/Umbraco/Umbraco.Archetype/Constants.cs

@@ -1,13 +0,0 @@
-namespace Archetype
-{
-    public static class Constants
-    {
-        public const string PropertyEditorAlias = "Imulus.Archetype";
-
-        public const string PreValueAlias = "archetypeConfig";
-
-        public const string CacheKey_DataTypeByGuid = "";
-
-        public const string CacheKey_PreValueFromDataTypeId = "Archetype_GetArchetypePreValueFromDataTypeId_";
-    }
-}

app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web;
-
-namespace Archetype.Events
-{
-    public class ExpireCache : ApplicationEventHandler
-    {
-
-        protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            base.ApplicationStarting(umbracoApplication, applicationContext);
-            
-            DataTypeService.Saved += ExpirePreValueCache;
-        }
-
-        void ExpirePreValueCache(IDataTypeService sender, global::Umbraco.Core.Events.SaveEventArgs<IDataTypeDefinition> e)
-        {
-            foreach (var dataType in e.SavedEntities)
-            {
-                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_PreValueFromDataTypeId + dataType.Id);
-                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_DataTypeByGuid + dataType.Key);
-            }
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs

@@ -1,154 +0,0 @@
-using System;
-using System.Linq;
-using Archetype.Models;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-
-namespace Archetype.Extensions
-{
-    public class ArchetypeHelper
-    {
-        protected JsonSerializerSettings _jsonSettings;
-        protected ApplicationContext _app;
-
-        private static readonly ArchetypeHelper _instance = new ArchetypeHelper();
-
-        internal static ArchetypeHelper Instance { get { return _instance; } }
-
-        internal ArchetypeHelper()
-        {
-            var dcr = new Newtonsoft.Json.Serialization.DefaultContractResolver();
-            dcr.DefaultMembersSearchFlags |= System.Reflection.BindingFlags.NonPublic;
-
-            _jsonSettings = new JsonSerializerSettings { ContractResolver = dcr };
-            _app = ApplicationContext.Current;
-        }
-
-        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
-        {
-            try
-            {
-                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
-
-                try
-                {
-                    // Get list of configured properties and their types and map them to the deserialized archetype model
-                    var preValue = GetArchetypePreValueFromPreValuesCollection(dataTypePreValues);
-                    RetrieveAdditionalProperties(ref archetype, preValue);
-                }
-                catch (Exception ex)
-                {
-                }
-
-                return archetype;
-            }
-            catch
-            {
-                return new Models.ArchetypeModel();
-            }
-        }
-
-        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
-        {
-            try
-            {
-                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
-
-                try
-                {
-                    // Get list of configured properties and their types and map them to the deserialized archetype model
-                    var preValue = GetArchetypePreValueFromDataTypeId(dataTypeId);
-                    RetrieveAdditionalProperties(ref archetype, preValue, hostContentType);
-                }
-                catch (Exception ex)
-                {
-                }
-
-                return archetype;
-            }
-            catch
-            {
-                return new Models.ArchetypeModel();
-            }
-        }
-
-        private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)
-        {
-            return _app.ApplicationCache.RuntimeCache.GetCacheItem(
-                Constants.CacheKey_PreValueFromDataTypeId + dataTypeId,
-                () =>
-                {
-                    var preValues = _app.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
-
-                    var configJson = preValues.IsDictionaryBased
-                        ? preValues.PreValuesAsDictionary[Constants.PreValueAlias].Value
-                        : preValues.PreValuesAsArray.First().Value;
-
-                    var config = JsonConvert.DeserializeObject<ArchetypePreValue>(configJson, _jsonSettings);
-                    RetrieveAdditionalProperties(ref config);
-
-                    return config;
-
-                }) as ArchetypePreValue;
-        }
-
-        private ArchetypePreValue GetArchetypePreValueFromPreValuesCollection(PreValueCollection dataTypePreValues)
-        {
-            var preValueAsString = dataTypePreValues.PreValuesAsDictionary.First().Value.Value;
-            var preValue = JsonConvert.DeserializeObject<ArchetypePreValue>(preValueAsString, _jsonSettings);
-            return preValue;
-        }
-
-        private IDataTypeDefinition GetDataTypeByGuid(Guid guid)
-        {
-            return (IDataTypeDefinition)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
-                Constants.CacheKey_DataTypeByGuid + guid,
-                () => _app.Services.DataTypeService.GetDataTypeDefinitionById(guid));
-        }
-
-        /// <summary>
-        /// Retrieves additional metadata that isn't available on the stored model of an Archetype
-        /// </summary>
-        /// <param name="archetype">The Archetype to add the additional metadata to</param>
-        /// <param name="preValue">The configuration of the Archetype</param>
-        private void RetrieveAdditionalProperties(ref Models.ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
-        {
-            foreach (var fieldset in preValue.Fieldsets)
-            {
-                var fieldsetAlias = fieldset.Alias;
-                foreach (var fieldsetInst in archetype.Fieldsets.Where(x => x.Alias == fieldsetAlias))
-                {
-                    foreach (var property in fieldset.Properties)
-                    {
-                        var propertyAlias = property.Alias;
-                        foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
-                        {
-                            propertyInst.DataTypeGuid = property.DataTypeGuid.ToString();
-                            propertyInst.DataTypeId = GetDataTypeByGuid(property.DataTypeGuid).Id;
-                            propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
-                            propertyInst.HostContentType = hostContentType;
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Retrieves additional metadata that isn't available on the stored model of an ArchetypePreValue
-        /// </summary>
-        /// <param name="archetype">The Archetype to add the additional metadata to</param>
-        /// <param name="preValue">The configuration of the Archetype</param>
-        private void RetrieveAdditionalProperties(ref Models.ArchetypePreValue preValue)
-        {
-            foreach (var fieldset in preValue.Fieldsets)
-            {
-                foreach (var property in fieldset.Properties)
-                {
-                    property.PropertyEditorAlias = GetDataTypeByGuid(property.DataTypeGuid).PropertyEditorAlias;
-                }
-            }
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
-using Archetype.Models;
-
-namespace Archetype.Extensions
-{
-    public static class Extensions
-    {
-        //lifted from the core as it is marked 'internal'
-        public static bool DetectIsJson(this string input)
-        {
-            input = input.Trim();
-            return input.StartsWith("{") && input.EndsWith("}")
-                   || input.StartsWith("[") && input.EndsWith("]");
-        }
-
-        public static bool IsArchetype(this ArchetypePropertyModel prop)
-        {
-            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
-        }
-
-        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel)
-        {
-            return RenderPartials(htmlHelper, archetypeModel, null, null);
-        }
-
-        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath)
-        {
-            return RenderPartials(htmlHelper, archetypeModel, partialPath, null);
-        }
-
-        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, ViewDataDictionary viewDataDictionary)
-        {
-            return RenderPartials(htmlHelper, archetypeModel, null, viewDataDictionary);
-        }
-
-        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
-        {
-            return RenderPartials(htmlHelper, archetypeModel, partialPath, viewDataDictionary);
-        }
-
-        private static IHtmlString RenderPartials(HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
-        {
-            var context = HttpContext.Current;
-
-            if (archetypeModel == null || context == null)
-            {
-                return new HtmlString("");
-            }
-
-            var sb = new StringBuilder();
-            
-            var pathToPartials = "~/Views/Partials/Archetype/";
-            if (!string.IsNullOrEmpty(partialPath))
-            {
-                pathToPartials = partialPath;
-            }
-
-            foreach (var fieldsetModel in archetypeModel)
-            {
-                var partial = pathToPartials + fieldsetModel.Alias + ".cshtml";
-
-                if (System.IO.File.Exists(context.Server.MapPath(partial)))
-                {
-                    sb.AppendLine(htmlHelper.Partial(partial, fieldsetModel, viewDataDictionary).ToString());
-                }
-                else
-                {
-                    LogHelper.Info<ArchetypeModel>(string.Format("The partial for {0} could not be found.  Please create a partial with that name or rename your alias.", context.Server.MapPath(partial)));
-                }
-            }
-
-            return new HtmlString(sb.ToString());
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs

@@ -1,87 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core;
-
-namespace Archetype.Models
-{
-    public class ArchetypeFieldsetModel
-    {
-        [JsonProperty("alias")]
-        public string Alias { get; set; }
-
-        [JsonProperty("disabled")]
-        public bool Disabled { get; set; }
-
-        [JsonProperty("properties")]
-        public IEnumerable<ArchetypePropertyModel> Properties;
-
-        public ArchetypeFieldsetModel()
-        {
-            Properties = new List<ArchetypePropertyModel>();
-        }
-
-        #region Helper Methods
-
-        public string GetValue(string propertyAlias)
-        {
-            return GetValue<string>(propertyAlias);
-        }
-
-        public T GetValue<T>(string propertyAlias)
-        {
-            var property = GetProperty(propertyAlias);
-
-            if (IsEmptyProperty(property)) 
-            {
-                return default(T);
-            }
-
-            return property.GetValue<T>();
-        }
-
-        // issue 142: support default T value supplied by caller
-        // this code would look nicer if the two GetValue<T>() methods had one common implementation.
-        // however, this would require GetValue<T>(string propertyAlias) to call the common implementation
-        // with a default(T) value, which could in theory result in a performance hit, if T for some reason
-        // is costly to instantiate.
-        public T GetValue<T>(string propertyAlias, T defaultValue)
-        {
-            var property = GetProperty(propertyAlias);
-
-            if (IsEmptyProperty(property)) 
-            {
-                return defaultValue;
-            }
-
-            return property.GetValue<T>();
-        }
-
-        private bool IsEmptyProperty(ArchetypePropertyModel property) 
-        {
-            return (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()));
-        }
-
-        public bool HasProperty(string propertyAlias)
-        {
-            return GetProperty(propertyAlias) != null;
-        }
-
-        public bool HasValue(string propertyAlias)
-        {
-            var property = GetProperty(propertyAlias);
-            if (property == null || property.Value == null)
-                return false;
-
-            return !string.IsNullOrEmpty(property.Value.ToString());
-        }
-
-        private ArchetypePropertyModel GetProperty(string propertyAlias)
-        {
-            return Properties.FirstOrDefault(p => p.Alias.InvariantEquals(propertyAlias));
-        }
-
-        #endregion
-
-    }
-}

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

@@ -1,45 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Archetype.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Archetype.Models
-{
-    [JsonObject]
-    public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
-    {
-        [JsonProperty("fieldsets")]
-        internal IEnumerable<ArchetypeFieldsetModel> Fieldsets { get; set; }
-
-        public ArchetypeModel()
-        {
-            Fieldsets = new List<ArchetypeFieldsetModel>();
-        }
-
-        public IEnumerator<ArchetypeFieldsetModel> GetEnumerator()
-        {
-            return this.Fieldsets.Where(f => f.Disabled == false).GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
-        }
-
-        internal string SerializeForPersistence()
-        {
-            var json = JObject.Parse(JsonConvert.SerializeObject(this));
-            var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType" };
-
-            json.Descendants().OfType<JProperty>()
-              .Where(p => propertiesToRemove.Contains(p.Name))
-              .ToList()
-              .ForEach(x => x.Remove());
-
-            return json.ToString(Formatting.None).DelintArchetypeJson();
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs

@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Archetype.Models
-{
-    public class ArchetypePreValue
-    {
-        [JsonProperty("showAdvancedOptions")]
-        public bool ShowAdvancedOptions { get; set; }
-
-        [JsonProperty("startWithAddButton")]
-        public bool StartWithAddButton { get; set; }
-
-        [JsonProperty("hideFieldsetToolbar")]
-        public bool HideFieldsetToolbar { get; set; }
-
-        [JsonProperty("enableMultipleFieldsets")]
-        public bool EnableMultipleFieldsets { get; set; }
-
-        [JsonProperty("enableCollapsing")]
-        public bool EnableCollapsing { get; set; }
-
-        [JsonProperty("enableDisabling")]
-        public bool EnableDisabling { get; set; }
-
-        [JsonProperty("hideFieldsetControls")]
-        public bool HideFieldsetControls { get; set; }
-
-        [JsonProperty("hidePropertyLabel")]
-        public bool HidePropertyLabel { get; set; }
-
-        [JsonProperty("maxFieldsets", NullValueHandling = NullValueHandling.Ignore)]
-        public int MaxFieldsets { get; set; }
-
-        [JsonProperty("fieldsets")]
-        public IEnumerable<ArchetypePreValueFieldset> Fieldsets { get; set; }
-
-        [JsonProperty("hidePropertyLabels")]
-        public bool HidePropertyLabels { get; set; }
-
-        [JsonProperty("customCssClass")]
-        public string CustomCssClass { get; set; }
-
-        [JsonProperty("customCssPath")]
-        public string CustomCssPath { get; set; }
-
-        [JsonProperty("customJsPath")]
-        public string CustomJsPath { get; set; }
-
-        [JsonProperty("customViewPath")]
-        public string CustomViewPath { get; set; }
-
-        [JsonProperty("developerMode")]
-        public bool DeveloperMode { get; set; }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Archetype.Models
-{
-    public class ArchetypePreValueFieldset
-    {
-        [JsonProperty("alias")]
-        public string Alias { get; set; }
-
-        [JsonProperty("remove")]
-        public bool Remove { get; set; }
-
-        [JsonProperty("collapse")]
-        public bool Collapse { get; set; }
-
-        [JsonProperty("labelTemplate")]
-        public string LabelTemplate { get; set; }
-
-        [JsonProperty("icon")]
-        public string Icon { get; set; }
-
-        [JsonProperty("label")]
-        public string Label { get; set; }
-
-        [JsonProperty("properties")]
-        public IEnumerable<ArchetypePreValueProperty> Properties { get; set; }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs

@@ -1,38 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Archetype.Models
-{
-    public class ArchetypePreValueProperty
-    {
-        [JsonProperty("alias")]
-        public string Alias { get; set; }
-
-        [JsonProperty("remove")]
-        public bool Remove { get; set; }
-
-        [JsonProperty("collapse")]
-        public bool Collapse { get; set; }
-
-        [JsonProperty("label")]
-        public string Label { get; set; }
-
-        [JsonProperty("helpText")]
-        public string HelpText { get; set; }
-        
-        [JsonProperty("dataTypeGuid")]
-        public Guid DataTypeGuid { get; set; }
-
-        [JsonProperty("propertyEditorAlias")]
-        public string PropertyEditorAlias { get; set; }
-
-        [JsonProperty("value")]
-        public string Value { get; set; }
-
-        [JsonProperty("required")]
-        public bool Required { get; set; }
-
-        [JsonProperty("regEx")]
-        public string RegEx { get; set; }
-    }
-}

app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs

@@ -1,93 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Web;
-
-namespace Archetype.Models
-{
-    public class ArchetypePropertyModel {
-        [JsonProperty("alias")]
-        public string Alias { get; internal set; }
-
-        [JsonProperty("value")]
-        public object Value { get; internal set; }
-
-        [JsonProperty("propertyEditorAlias")]
-        public string PropertyEditorAlias { get; internal set; }
-
-        [JsonProperty("dataTypeId")]
-        public int DataTypeId { get; internal set; }
-
-        [JsonProperty("dataTypeGuid")]
-        internal string DataTypeGuid { get; set; }
-
-        [JsonProperty("hostContentType")]
-        internal PublishedContentType HostContentType { get; set; }
-
-        public T GetValue<T>()
-        {
-
-            // Try Umbraco's PropertyValueConverters
-            var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty<IPropertyValueConverter>();
-            if (converters.Any())
-            {
-                var convertedAttempt = TryConvertWithPropertyValueConverters<T>(Value, converters);
-                if (convertedAttempt.Success)
-                    return convertedAttempt.Result;
-            }
-
-            // If the value is of type T, just return it
-            if (Value is T)
-                return (T)Value;
-
-            // No PropertyValueConverters matched, so try a regular type conversion
-            var convertAttempt2 = Value.TryConvertTo<T>();
-            if (convertAttempt2.Success)
-                return convertAttempt2.Result;
-
-            return default(T);
-        }
-
-        private Attempt<T> TryConvertWithPropertyValueConverters<T>(object value, IEnumerable<IPropertyValueConverter> converters)
-        {
-            var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias);
-
-            // In umbraco, there are default value converters that try to convert the 
-            // value if all else fails. The problem is, they are also in the list of
-            // converters, and the means for filtering these out is internal, so
-            // we currently have to try ALL converters to see if they can convert
-            // rather than just finding the most appropreate. If the ability to filter
-            // out default value converters becomes public, the following logic could
-            // and probably should be changed.
-            foreach (var converter in converters.Where(x => x.IsConverter(properyType)))
-            {
-                // Convert the type using a found value converter
-                var value2 = converter.ConvertDataToSource(properyType, value, false);
-
-                // If the value is of type T, just return it
-                if (value2 is T)
-                    return Attempt<T>.Succeed((T)value2);
-
-                // Value is not final value type, so try a regular type conversion aswell
-                var convertAttempt = value2.TryConvertTo<T>();
-                if (convertAttempt.Success)
-                    return Attempt<T>.Succeed(convertAttempt.Result);
-            }
-
-            return Attempt<T>.Fail();
-        }
-
-        private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
-        {
-            return new PublishedPropertyType(this.HostContentType,
-                new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias)
-                {
-                    Id = dataTypeId
-                }));
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs

@@ -1,18 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Archetype")]
-[assembly: AssemblyDescription("Archetype's supporting code library for Umbraco")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Imulus")]
-[assembly: AssemblyProduct("Archetype")]
-[assembly: AssemblyCopyright("Copyright \xa9 Imulus 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-[assembly: Guid("E37E94F9-C7BA-4B54-B7E1-64419B3DBA0B")]
-
-[assembly: InternalsVisibleTo("Archetype.Courier")]
-[assembly: InternalsVisibleTo("Archetype.Tests")]

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

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

app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs

@@ -1,49 +0,0 @@
-using System;
-using Archetype.Extensions;
-using Archetype.Models;
-using Umbraco.Core;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-
-namespace Archetype.PropertyConverters
-{
-    [PropertyValueType(typeof(Models.ArchetypeModel))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
-    public class ArchetypeValueConverter : PropertyValueConverterBase
-    {
-
-        public ServiceContext Services
-        {
-            get { return ApplicationContext.Current.Services; }
-        }
-
-        public override bool IsConverter(PublishedPropertyType propertyType)
-        {
-            return !String.IsNullOrEmpty(propertyType.PropertyEditorAlias) 
-                && propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias);
-        }
-
-        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
-        {
-            var defaultValue = new ArchetypeModel();
-
-            if (source == null)
-                return defaultValue;
-
-            var sourceString = source.ToString();
-
-            if (!sourceString.DetectIsJson())
-                return defaultValue;
-
-			using (var timer = DisposableTimer.DebugDuration<ArchetypeValueConverter>(string.Format("ConvertDataToSource ({0})", propertyType != null ? propertyType.PropertyTypeAlias : "null")))
-            {
-                var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(sourceString,
-                    (propertyType != null ? propertyType.DataTypeId : -1),
-                    (propertyType != null ? propertyType.ContentType : null));
-
-                return archetype;
-            }
-        }
-    }
-}

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

@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Archetype.Extensions;
-using ClientDependency.Core;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Editors;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.PropertyEditors;
-
-namespace Archetype.PropertyEditors
-{
-	[PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")]
-	[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
-	public class ArchetypePropertyEditor : PropertyEditor
-	{
-		#region Pre Value Editor
-
-		protected override PreValueEditor CreatePreValueEditor()
-		{
-			return new ArchetypePreValueEditor();
-		}
-
-		internal class ArchetypePreValueEditor : PreValueEditor
-		{
-			[PreValueField("archetypeConfig", "Config", "/App_Plugins/Archetype/views/archetype.config.html",
-				Description = "(Required) Describe your Archetype.")]
-			public string Config { get; set; }
-
-			[PreValueField("hideLabel", "Hide Label", "boolean",
-				Description = "Hide the Umbraco property title and description, making the Archetype span the entire page width")]
-			public bool HideLabel { get; set; }
-		}
-
-		#endregion
-
-		#region Value Editor
-
-		protected override PropertyValueEditor CreateValueEditor()
-		{
-			return new ArchetypePropertyValueEditor(base.CreateValueEditor());
-		}
-
-		internal class ArchetypePropertyValueEditor : PropertyValueEditorWrapper
-		{
-			protected JsonSerializerSettings _jsonSettings;
-
-			public ArchetypePropertyValueEditor(PropertyValueEditor wrapped)
-				: base(wrapped) { }
-
-			public override string ConvertDbToString(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
-			{
-				if (property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
-
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
-
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties)
-					{
-                        try
-                        {
-						    var dtd = dataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
-						    var propType = new PropertyType(dtd) { Alias = propDef.Alias };
-						    var prop = new Property(propType, propDef.Value);
-						    var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-						    propDef.Value = propEditor.ValueEditor.ConvertDbToString(prop, propType, dataTypeService);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
-                        }
-					}
-				}
-
-                return archetype.SerializeForPersistence();
-			}
-
-			public override object ConvertDbToEditor(Property property, PropertyType propertyType, IDataTypeService dataTypeService)
-			{
-				if (property.Value == null || property.Value.ToString() == "")
-					return string.Empty;
-
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(property.Value.ToString(), propertyType.DataTypeDefinitionId);
-
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties)
-					{
-                        try
-                        {
-                            var dtd = dataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
-                            var propType = new PropertyType(dtd) { Alias = propDef.Alias };
-                            var prop = new Property(propType, propDef.Value);
-                            var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-                            propDef.Value = propEditor.ValueEditor.ConvertDbToEditor(prop, propType, dataTypeService);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
-                        }
-					}
-				}
-
-				return archetype;
-			}
-            public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
-			{
-				if (editorValue.Value == null || editorValue.Value.ToString() == "")
-					return string.Empty;
-
-				var archetype = ArchetypeHelper.Instance.DeserializeJsonToArchetype(editorValue.Value.ToString(), editorValue.PreValues);
-
-				foreach (var fieldset in archetype.Fieldsets)
-				{
-					foreach (var propDef in fieldset.Properties)
-					{
-                        try
-                        {
-						    var dtd = ApplicationContext.Current.Services.DataTypeService.GetDataTypeDefinitionById(Guid.Parse(propDef.DataTypeGuid));
-						    var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtd.Id);
-						    var propData = new ContentPropertyData(propDef.Value, preValues, new Dictionary<string, object>());
-                            var propEditor = PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-						    propDef.Value = propEditor.ValueEditor.ConvertEditorToDb(propData, propDef.Value);
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.Error<ArchetypeHelper>(ex.Message, ex);
-                        }
-					}
-				}
-
-                return archetype.SerializeForPersistence();
-			}
-
-		    internal virtual PropertyEditor GetPropertyEditor(IDataTypeDefinition dtd)
-		    {
-		        if (dtd.Id != 0) 
-                    return PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
-
-		        return dtd.PropertyEditorAlias.Equals(Constants.PropertyEditorAlias)
-		            ? new ArchetypePropertyEditor()
-                    : (PropertyEditor)new TextboxPropertyEditor();
-		    }
-		}
-
-		#endregion	
-	}
-}

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);
-        }
-    }
-}

app/Umbraco/Umbraco.Archetype/app.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

app/Umbraco/Umbraco.Archetype/packages.config

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
-  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
-</packages>

app/controllers/config.controller.js

@@ -1,294 +0,0 @@
-angular.module("umbraco").controller("Imulus.ArchetypeConfigController", function ($scope, $http, assetsService, dialogService, archetypePropertyEditorResource) {
-
-    //$scope.model.value = "";
-    //console.log($scope.model.value);
-
-    //define empty items
-    var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}';
-    var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}';
-    var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableDisabling": true, "fieldsets": [' + newFieldsetModel + ']}');
-
-    //ini the model
-    $scope.model.value = $scope.model.value || defaultFieldsetConfigModel;
-
-    //ini the render model
-    initConfigRenderModel();
-
-    //get the available datatypes
-    archetypePropertyEditorResource.getAllDataTypes().then(function(data) {
-        $scope.availableDataTypes = data;
-    });
-
-    //iconPicker
-    $scope.selectIcon = function(fieldset){
-        var dialog = dialogService.iconPicker({
-            callback: function(data){
-                fieldset.icon = data;
-            }
-        });
-    }
-
-    //config for the sorting
-    $scope.sortableOptions = {
-        axis: 'y',
-        cursor: "move",
-        handle: ".handle",
-        update: function (ev, ui) {
-
-        },
-        stop: function (ev, ui) {
-
-        }
-    };
-
-    //function that determines how to manage expanding/collapsing fieldsets
-    $scope.focusFieldset = function(fieldset){
-        var iniState;
-
-        if(fieldset)
-        {
-            iniState = fieldset.collapse;
-        }
-
-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-            if($scope.archetypeConfigRenderModel.fieldsets.length == 1 && fieldset.remove == false)
-            {
-                fieldset.collapse = false;
-                return;
-            }
-
-            if(fieldset.label)
-            {
-                fieldset.collapse = true;
-            }
-            else
-            {
-                fieldset.collapse = false;
-            }
-        });
-
-        if(iniState)
-        {
-            fieldset.collapse = !iniState;
-        }
-    }
-
-    //ini the fieldsets
-    $scope.focusFieldset();
-
-    //function that determines how to manage expanding/collapsing properties
-    $scope.focusProperty = function(properties, property){
-        var iniState;
-
-        if(property)
-        {
-            iniState = property.collapse;
-        }
-
-        _.each(properties, function(property){
-            if(property.label)
-            {
-                property.collapse = true;
-            }
-            else
-            {
-                property.collapse = false;
-            }
-        });
-
-        if(iniState)
-        {
-            property.collapse = !iniState;
-        }
-    }
-
-    //ini the properties
-    _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-            $scope.focusProperty(fieldset.properties);
-    });
-
-    //setup JSON.stringify helpers
-    $scope.archetypeConfigRenderModel.toString = stringify;
-
-    //encapsulate stringify (should be built into browsers, not sure of IE support)
-    function stringify() {
-        return JSON.stringify(this);
-    }
-
-    //watch for changes
-    $scope.$watch('archetypeConfigRenderModel', function (v) {
-        //console.log(v);
-        if (typeof v === 'string') {
-            $scope.archetypeConfigRenderModel = JSON.parse(v);
-            $scope.archetypeConfigRenderModel.toString = stringify;
-        }
-    });
-
-    $scope.autoPopulateAlias = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
-            modelProperty.alias = modelProperty.label.toUmbracoAlias();
-        }
-    }
-
-    $scope.markAliasDirty = function(s) {
-        var modelType = s.hasOwnProperty('fieldset') ? 'fieldset' : 'property';
-        var modelProperty = s[modelType];
-
-        if (!modelProperty.aliasIsDirty) {
-            modelProperty.aliasIsDirty = true;;
-        }
-    }
-
-    //helper that returns if an item can be removed
-    $scope.canRemoveFieldset = function ()
-    {
-        return countVisibleFieldset() > 1;
-    }
-
-    //helper that returns if an item can be sorted
-    $scope.canSortFieldset = function ()
-    {
-        return countVisibleFieldset() > 1;
-    }
-
-    //helper that returns if an item can be removed
-    $scope.canRemoveProperty = function (fieldset)
-    {
-        return countVisibleProperty(fieldset) > 1;
-    }
-
-    //helper that returns if an item can be sorted
-    $scope.canSortProperty = function (fieldset)
-    {
-        return countVisibleProperty(fieldset) > 1;
-    }
-
-    $scope.getDataTypeNameByGuid = function (guid) {
-        if ($scope.availableDataTypes == null) // Might not be initialized yet?
-            return "";
-        
-        var dataType = _.find($scope.availableDataTypes, function(d) {
-            return d.guid == guid;
-        });
-
-        return dataType == null ? "" : dataType.name;
-    }
-
-    //helper to count what is visible
-    function countVisibleFieldset()
-    {
-        var count = 0;
-
-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-            if (fieldset.remove == false) {
-                count++;
-            }
-        });
-
-        return count;
-    }
-
-    //determines how many properties are visible
-    function countVisibleProperty(fieldset)
-    {
-        var count = 0;
-
-        for (var i in fieldset.properties) {
-            if (fieldset.properties[i].remove == false) {
-                count++;
-            }
-        }
-
-        return count;
-    }
-
-    //handles a fieldset add
-    $scope.addFieldsetRow = function ($index, $event) {
-        $scope.archetypeConfigRenderModel.fieldsets.splice($index + 1, 0, JSON.parse(newFieldsetModel));
-        $scope.focusFieldset();
-    }
-
-    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
-    $scope.removeFieldsetRow = function ($index) {
-        if ($scope.canRemoveFieldset()) {
-            if (confirm('Are you sure you want to remove this?')) {
-                $scope.archetypeConfigRenderModel.fieldsets[$index].remove = true;
-            }
-        }
-    }
-
-    //handles a property add
-    $scope.addPropertyRow = function (fieldset, $index) {
-        fieldset.properties.splice($index + 1, 0, JSON.parse(newPropertyModel));
-    }
-
-    //rather than splice the archetypeConfigRenderModel, we're hiding this and cleaning onFormSubmitting
-    $scope.removePropertyRow = function (fieldset, $index) {
-        if ($scope.canRemoveProperty(fieldset)) {
-            if (confirm('Are you sure you want to remove this?')) {
-                fieldset.properties[$index].remove = true;
-            }
-        }
-    }
-
-    //helper to ini the render model
-    function initConfigRenderModel()
-    {
-        $scope.archetypeConfigRenderModel = $scope.model.value;
-
-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-
-            fieldset.remove = false;
-            if (fieldset.alias.length > 0)
-                fieldset.aliasIsDirty = true;
-
-            if(fieldset.label)
-            {
-                fieldset.collapse = true;
-            }
-
-            _.each(fieldset.properties, function(fieldset){
-                fieldset.remove = false;
-                if (fieldset.alias.length > 0)
-                    fieldset.aliasIsDirty = true;
-            });
-        });
-    }
-
-    //sync things up on save
-    $scope.$on("formSubmitting", function (ev, args) {
-        syncModelToRenderModel();
-    });
-
-    //helper to sync the model to the renderModel
-    function syncModelToRenderModel()
-    {
-        $scope.model.value = $scope.archetypeConfigRenderModel;
-        var fieldsets = [];
-
-        _.each($scope.archetypeConfigRenderModel.fieldsets, function(fieldset){
-            //check fieldsets
-            if (!fieldset.remove) {
-                fieldsets.push(fieldset);
-
-                var properties = [];
-
-                _.each(fieldset.properties, function(property){
-                   if (!property.remove) {
-                        properties.push(property);
-                    }
-                });
-
-                fieldset.properties = properties;
-            }
-        });
-
-        $scope.model.value.fieldsets = fieldsets;
-    }
-
-    //archetype css
-    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
-});

app/controllers/controller.js

@@ -1,322 +0,0 @@
-angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, assetsService, angularHelper, notificationsService, $timeout) {
-
-    //$scope.model.value = "";
-    $scope.model.hideLabel = $scope.model.config.hideLabel == 1;
-
-    //get a reference to the current form
-    $scope.form = $scope.form || angularHelper.getCurrentForm($scope);
-
-    //set the config equal to our prevalue config
-    $scope.model.config = $scope.model.config.archetypeConfig;
-
-    //ini the model
-    $scope.model.value = $scope.model.value || getDefaultModel($scope.model.config);
-
-    // store the umbraco property alias to help generate unique IDs.  Hopefully there's a better way to get this in the future :)
-    $scope.umbracoHostPropertyAlias = $scope.$parent.$parent.model.alias;
-
-    init();
-
-    //helper to get $eval the labelTemplate
-    $scope.getFieldsetTitle = function(fieldsetConfigModel, fieldsetIndex) {
-        if(!fieldsetConfigModel)
-            return "";
-        var fieldset = $scope.model.value.fieldsets[fieldsetIndex];
-        var fieldsetConfig = $scope.getConfigFieldsetByAlias(fieldset.alias);
-        var template = fieldsetConfigModel.labelTemplate;
-
-        if (template.length < 1)
-            return fieldsetConfig.label;
-
-        var rgx = /{{(.*?)}}*/g;
-        var results;
-        var parsedTemplate = template;
-
-        while ((results = rgx.exec(template)) !== null) {
-            var propertyAlias = results[1];
-            var propertyValue = $scope.getPropertyValueByAlias(fieldset, propertyAlias);
-            parsedTemplate = parsedTemplate.replace(results[0], propertyValue);
-        }
-
-        return parsedTemplate;
-    };
-
-    //sort config
-    $scope.sortableOptions = {
-        axis: 'y',
-        cursor: "move",
-        handle: ".handle",
-        update: function (ev, ui) {
-            $scope.setDirty();
-        },
-        stop: function (ev, ui) {
-
-        }
-    };
-
-    //handles a fieldset add
-    $scope.addRow = function (fieldsetAlias, $index) {
-        if ($scope.canAdd())
-        {
-            if ($scope.model.config.fieldsets)
-            {
-                var newFieldset = getEmptyRenderFieldset($scope.getConfigFieldsetByAlias(fieldsetAlias));
-
-                if (typeof $index != 'undefined')
-                {
-                    $scope.model.value.fieldsets.splice($index + 1, 0, newFieldset);
-                }
-                else
-                {
-                    $scope.model.value.fieldsets.push(newFieldset);
-                }
-            }
-            $scope.setDirty();
-
-            newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
-            $scope.focusFieldset(newFieldset);
-        }
-    }
-
-    $scope.removeRow = function ($index) {
-        if ($scope.canRemove()) {
-            if (confirm('Are you sure you want to remove this?')) {
-                $scope.setDirty();
-                $scope.model.value.fieldsets.splice($index, 1);
-            }
-        }
-    }
-
-    $scope.enableDisable = function (fieldset) {
-        fieldset.disabled = !fieldset.disabled;
-        // explicitly set the form as dirty when manipulating the enabled/disabled state of a fieldset
-        $scope.setDirty();
-    }
-
-    //helpers for determining if a user can do something
-    $scope.canAdd = function ()
-    {
-        if ($scope.model.config.maxFieldsets)
-        {
-            return countVisible() < $scope.model.config.maxFieldsets;
-        }
-
-        return true;
-    }
-
-    //helper that returns if an item can be removed
-    $scope.canRemove = function ()
-    {
-        return countVisible() > 1 
-            || ($scope.model.config.maxFieldsets == 1 && $scope.model.config.fieldsets.length > 1)
-            || $scope.model.config.startWithAddButton;
-    }
-
-    //helper that returns if an item can be sorted
-    $scope.canSort = function ()
-    {
-        return countVisible() > 1;
-    }
-
-    //helper that returns if an item can be disabled
-    $scope.canDisable = function () {
-        return $scope.model.config.enableDisabling;
-    }
-
-    //helpers for determining if the add button should be shown
-    $scope.showAddButton = function () {
-        return $scope.model.config.startWithAddButton
-            && countVisible() === 0;
-            ///&& $scope.model.config.fieldsets.length == 1;
-    }
-
-    //helper, ini the render model from the server (model.value)
-    function init() {
-        $scope.model.value = removeNulls($scope.model.value);
-        addDefaultProperties($scope.model.value.fieldsets);
-    }
-
-    function addDefaultProperties(fieldsets)
-    {
-        _.each(fieldsets, function (fieldset)
-        {
-            fieldset.collapse = false;
-            fieldset.isValid = true;
-        });
-    }
-
-    //helper to get the correct fieldset from config
-    $scope.getConfigFieldsetByAlias = function(alias) {
-        return _.find($scope.model.config.fieldsets, function(fieldset){
-            return fieldset.alias == alias;
-        });
-    }
-
-    //helper to get a property by alias from a fieldset
-    $scope.getPropertyValueByAlias = function(fieldset, propertyAlias) {
-        var property = _.find(fieldset.properties, function(p) {
-            return p.alias == propertyAlias;
-        });
-        return (typeof property !== 'undefined') ? property.value : '';
-    };
-
-    $scope.isCollapsed = function(fieldset)
-    {
-        if(typeof fieldset.collapse === "undefined")
-        {
-            fieldset.collapse = true;
-        }
-        return fieldset.collapse;
-    }
-
-    //helper for expanding/collapsing fieldsets
-    $scope.focusFieldset = function(fieldset){
-        fixDisableSelection();
-
-        if (!$scope.model.config.enableCollapsing) {
-            return;
-        }
-
-        var iniState;
-
-        if(fieldset)
-        {
-            iniState = fieldset.collapse;
-        }
-
-        _.each($scope.model.value.fieldsets, function(fieldset){
-            fieldset.collapse = true;
-        });
-
-        if(!fieldset && $scope.model.value.fieldsets.length == 1)
-        {
-            $scope.model.value.fieldsets[0].collapse = false;
-            return;
-        }
-
-        if(iniState && fieldset)
-        {
-            fieldset.collapse = !iniState;
-        }
-    }
-
-    //ini the fieldset expand/collapse
-    $scope.focusFieldset();
-
-    //developerMode helpers
-    $scope.model.value.toString = stringify;
-
-    //encapsulate stringify (should be built into browsers, not sure of IE support)
-    function stringify() {
-        return JSON.stringify(this);
-    }
-
-    //watch for changes
-    $scope.$watch('model.value', function (v) {
-        if ($scope.model.config.developerMode) {
-            console.log(v);
-            if (typeof v === 'string') {
-                $scope.model.value = JSON.parse(v);
-                $scope.model.value.toString = stringify;
-            }
-        }
-    });
-
-    //helper to count what is visible
-    function countVisible()
-    {
-        return $scope.model.value.fieldsets.length;
-    }
-
-    // helper to get initial model if none was provided
-    function getDefaultModel(config) {
-        if (config.startWithAddButton)
-            return { fieldsets: [] };
-
-        return { fieldsets: [getEmptyRenderFieldset(config.fieldsets[0])] };
-    }
-
-    //helper to add an empty fieldset to the render model
-    function getEmptyRenderFieldset (fieldsetModel) {
-        return {alias: fieldsetModel.alias, collapse: false, isValid: true, properties: []};
-    }
-
-    //helper to ensure no nulls make it into the model
-    function removeNulls(model){
-        if(model.fieldsets){
-            _.each(model.fieldsets, function(fieldset, index){
-                if(!fieldset){
-                    model.fieldsets.splice(index, 1);
-                    removeNulls(model);
-                }
-            });
-
-            return model;
-        }
-    }
-
-    // Hack for U4-4281 / #61
-    function fixDisableSelection() {
-        $timeout(function() {
-            $('.archetypeEditor .controls')
-                .bind('mousedown.ui-disableSelection selectstart.ui-disableSelection', function(e) {
-                    e.stopImmediatePropagation();
-                });
-        }, 1000);
-    }
-
-    //helper to lookup validity when given a fieldsetIndex and property alias
-    $scope.getPropertyValidity = function(fieldsetIndex, alias)
-    {
-        if($scope.model.value.fieldsets[fieldsetIndex])
-        {
-            var property = _.find($scope.model.value.fieldsets[fieldsetIndex].properties, function(property){
-                return property.alias == alias;
-            });
-        }
-
-        return (typeof property == 'undefined') ? true : property.isValid;
-    }
-
-    //helper to lookup validity when given a fieldset
-    $scope.getFieldsetValidity = function (fieldset) {
-        if (fieldset.isValid == false) {
-            return false;
-        }
-
-        // recursive validation of nested fieldsets
-        var nestedFieldsetsValid = true;
-        _.each(fieldset.properties, function (property) {
-            if (property != null && property.value != null && property.propertyEditorAlias == "Imulus.Archetype") {
-                _.each(property.value.fieldsets, function (inner) {
-                    if ($scope.getFieldsetValidity(inner) == false) {
-                        nestedFieldsetsValid = false;
-                    }
-                });
-            }
-        });
-
-        return nestedFieldsetsValid;
-    }
-
-    // helper to force the current form into the dirty state
-    $scope.setDirty = function () {
-        if($scope.form) {
-            $scope.form.$setDirty();
-        }
-    }
-
-    //custom js
-    if ($scope.model.config.customJsPath) {
-        assetsService.loadJs($scope.model.config.customJsPath);
-    }
-
-    //archetype css
-    assetsService.loadCss("/App_Plugins/Archetype/css/archetype.css");
-
-    //custom css
-    if($scope.model.config.customCssPath)
-    {
-        assetsService.loadCss($scope.model.config.customCssPath);
-    }
-});

app/directives/archetypecustomview.js

@@ -1,22 +0,0 @@
-angular.module("umbraco.directives").directive('archetypeCustomView', function ($compile, $http) {
-    var linker = function (scope, element, attrs) {
-
-        var view = "/App_plugins/Archetype/views/archetype.default.html";
-        if(scope.model.config.customViewPath) {
-            view = config.customViewPath;
-        }
-
-        $http.get(view).then(function(data) {
-
-            element.html(data.data).show();
-
-            $compile(element.contents())(scope);
-        });
-    }
-
-    return {
-        restrict: "A",
-        replace: true,
-        link: linker
-    }
-});

app/directives/archetypeproperty.js

@@ -1,248 +0,0 @@
-angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q) {
-
-    function getFieldsetByAlias(fieldsets, alias)
-    {
-        return _.find(fieldsets, function(fieldset){
-            return fieldset.alias == alias;
-        });
-    }
-
-    function getPropertyIndexByAlias(properties, alias){
-        for (var i in properties)
-        {
-            if (properties[i].alias == alias) {
-                return i;
-            }
-        }
-    }
-
-    function getPropertyByAlias(fieldset, alias){
-        return _.find(fieldset.properties, function(property){
-            return property.alias == alias; 
-        });
-    }
-
-    //helper that returns a JS ojbect from 'value' string or the original string
-    function jsonOrString(value, developerMode, debugLabel){
-        if(value && typeof value == 'string'){
-            try{
-                if(developerMode == '1'){
-                    console.log("Trying to parse " + debugLabel + ": " + value); 
-                }
-                value = JSON.parse(value);
-            }
-            catch(exception)
-            {
-                if(developerMode == '1'){
-                    console.log("Failed to parse " + debugLabel + "."); 
-                }
-            }
-        }
-
-        if(value && developerMode == '1'){
-            console.log(debugLabel + " post-parsing: ");
-            console.log(value); 
-        }
-
-        return value;
-    }
-
-    var linker = function (scope, element, attrs, ngModelCtrl) {
-        var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias);
-        var view = "";
-        var label = configFieldsetModel.properties[scope.propertyConfigIndex].label;
-        var dataTypeGuid = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeGuid;
-        var config = null;
-        var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
-        var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
-        var propertyAlias = getUniquePropertyAlias(scope);
-        propertyAliasParts = [];
-        // initialize container for invalid fieldset property identifiers (store on ngModelCtrl to separate Archetype validations, e.g. when there two Archetype properties on the same document)
-        if(ngModelCtrl.invalidProperties == null) {
-            ngModelCtrl.invalidProperties = [];
-        }
-
-        //try to convert the defaultValue to a JS object
-        defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");
-
-        //grab info for the selected datatype, prepare for view
-        archetypePropertyEditorResource.getDataType(dataTypeGuid).then(function (data) {
-            //transform preValues array into object expected by propertyeditor views
-            var configObj = {};
-            _.each(data.preValues, function(p) {
-                configObj[p.key] = p.value;
-            });
-            config = configObj;
-
-            //determine the view to use [...] and load it
-            archetypePropertyEditorResource.getPropertyEditorMapping(data.selectedEditor).then(function(propertyEditor) {
-                var pathToView = umbPropEditorHelper.getViewPath(propertyEditor.view);
-
-                //load in the DefaultPreValues for the PropertyEditor, if any
-                var defaultConfigObj =  {};
-                if (propertyEditor.hasOwnProperty('defaultPreValues') && propertyEditor.defaultPreValues != null) {
-                    _.extend(defaultConfigObj, propertyEditor.defaultPreValues);
-                }
-
-                var mergedConfig = _.extend(defaultConfigObj, config);
-
-                loadView(pathToView, mergedConfig, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, validateProperty);
-            });
-        });
-
-        scope.$on("formSubmitting", function (ev, args) {
-            // "hard" validate to highlight any erroneous entries
-            _.each(scope.fieldset.properties, function (property) {
-                validateProperty(scope.fieldset, property, true);
-            });
-        });
-
-        scope.$on("formSubmitted", function (ev, args) {
-            // reset the nested fieldset validation state after submit
-            ngModelCtrl.invalidProperties = [];
-        });
-
-        // need to pass the property fieldset here to clear any invalid state of the fieldset when validating a single fieldset property
-        // - it's the Umbraco way to hide the invalid state when altering an invalid property, even if the new value isn't valid either
-        function validateProperty(fieldset, property, markAsInvalid) {
-            var valid = true;
-            fieldset.isValid = true;
-            property.isValid = true;
-            var propertyConfig = getPropertyByAlias(configFieldsetModel, property.alias);
-            if (propertyConfig) {
-                // use property.value !== property.value to check for NaN values on numeric inputs
-                if (propertyConfig.required && (property.value == null || property.value === "" || property.value !== property.value)) {
-                    valid = false;
-                }
-                // issue 116: RegEx validate property value
-                // Only validate the property value if anything has been entered - RegEx is considered a supplement to "required".
-                if (valid == true && propertyConfig.regEx && property.value) {
-                    var regEx = new RegExp(propertyConfig.regEx);
-                    if (regEx.test(property.value) == false) {
-                        valid = false;
-                    }
-                }
-                // only mark the property as invalid when doing a "hard" validation
-                if (valid == false && markAsInvalid == true) {
-                    property.isValid = false;
-                }
-            }
-
-            // handle nested fieldset validation by storing the identifier of all invalid fieldset properties 
-            var fieldsetIdentifier = scope.umbracoPropertyAlias + "_" + scope.fieldsetIndex;
-            var propertyIdentifier = fieldsetIdentifier + "_" + property.alias;
-            var propertyIdentifierIndex = ngModelCtrl.invalidProperties.indexOf(propertyIdentifier);
-            if (valid == false) {
-                if (propertyIdentifierIndex == -1) {
-                    ngModelCtrl.invalidProperties.push(propertyIdentifier);
-                }
-            }
-            else {
-                if (propertyIdentifierIndex != -1) {
-                    ngModelCtrl.invalidProperties.splice(propertyIdentifierIndex, 1);
-                }
-            }
-            
-            if (markAsInvalid) {
-                // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
-                fieldset.isValid =
-                    _.find(ngModelCtrl.invalidProperties, function (item) {
-                        return item.indexOf(fieldsetIdentifier) == 0
-                    }) == null;
-            }
-
-            // set invalid state if one or more fieldsets contain invalid properties
-            ngModelCtrl.$setValidity('validation', ngModelCtrl.invalidProperties.length == 0);
-        }
-    }
-
-    var propertyAliasParts = [];
-    var getUniquePropertyAlias = function (currentScope) {
-        if (currentScope.hasOwnProperty('fieldsetIndex') && currentScope.hasOwnProperty('property') && currentScope.hasOwnProperty('propertyConfigIndex'))
-        {
-            var currentPropertyAlias = "f" + currentScope.fieldsetIndex + "-" + currentScope.property.alias + "-p" + currentScope.propertyConfigIndex;
-            propertyAliasParts.push(currentPropertyAlias);
-        }
-        else if (currentScope.hasOwnProperty('isPreValue')) // Crappy way to identify this is the umbraco property scope
-        {
-            var umbracoPropertyAlias = currentScope.$parent.$parent.property.alias; // Crappy way to get the umbraco host alias once we identify its scope
-            propertyAliasParts.push(umbracoPropertyAlias);
-        }
-
-        if (currentScope.$parent)
-            getUniquePropertyAlias(currentScope.$parent);
-
-        return _.unique(propertyAliasParts).reverse().join("-");
-    };
-
-
-    function loadView(view, config, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, validateProperty) {
-        if (view)
-        {
-            $http.get(view).success(function (data) {
-                if (data) {
-                    if (scope.archetypeConfig.developerMode == '1')
-                    {
-                        console.log(scope);
-                    }
-
-                    //define the initial model and config
-                    scope.form = scope.umbracoForm;
-                    scope.model = {};
-                    scope.model.config = {};
-
-                    //ini the property value after test to make sure a prop exists in the renderModel
-                    var renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
-
-                    if (!renderModelPropertyIndex)
-                    {
-                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties.push(JSON.parse('{"alias": "' + alias + '", "value": "' + defaultValue + '"}'));
-                        renderModelPropertyIndex = getPropertyIndexByAlias(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties, alias);
-                    }
-                    scope.model.value = scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value;
-
-                    //set the config from the prevalues
-                    scope.model.config = config;
-
-                    //some items need an alias
-                    scope.model.alias = "archetype-property-" + propertyAlias;
-
-                    //watch for changes since there is no two-way binding with the local model.value
-                    scope.$watch('model.value', function (newValue, oldValue) {
-                        scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex].value = newValue;
-
-                        // call validation method for the property when the value changes 
-                        // use "soft" validation to mimic the default umbraco validation style (show error highlights on submit, not while entering data)
-                        validateProperty(scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex], scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex].properties[renderModelPropertyIndex], false);
-                    });
-
-                    element.html(data).show();
-                    $compile(element.contents())(scope);
-
-                    $timeout(function() {
-                        var def = $q.defer();
-                        def.resolve(true);
-                        $rootScope.$apply();
-                    }, 500);
-                }
-            });
-        }
-    }
-
-    return {
-        require: "^ngModel",
-        restrict: "E",
-        replace: true,
-        link: linker,
-        scope: {
-            property: '=',
-            propertyConfigIndex: '=',
-            archetypeConfig: '=',
-            fieldset: '=',
-            fieldsetIndex: '=',
-            archetypeRenderModel: '=',
-            umbracoPropertyAlias: '=',
-            umbracoForm: '='
-        }
-    }
-});

app/directives/localize.js

@@ -1,21 +0,0 @@
-angular.module("umbraco.directives").directive('archetypeLocalize', function (archetypeLocalizationService) {
-	var linker = function (scope, element, attrs){
-
-		var key = scope.key;
-        
-        archetypeLocalizationService.localize(key).then(function(value){
-        	if(value){
-        		element.html(value);
-        	}
-        });
-	}   
-
-	return {
-	    restrict: "E",
-	    rep1ace: true,
-	    link: linker,
-	    scope: {
-	    	key: '@'
-	    }
-	}
-});

app/langs/da-dk.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Skjul fieldsets?",
-	"hideFieldsetControlsDescription": "Skjuler kontrollerne tilføj/fjern/sortér.",
-	"toggleAdvanced": "Slå avancerede muligheder til/fra",
-	"toggleAdvancedDescription": "Vis avancerede muligheder.",
-	"hidePropertyLabels": "Skjul labels på egenskaber?",
-	"hidePropertyLabelsDescription": "Skjuler labels på egenskaber.",
-	"maxFieldsets": "Maks antal fieldsets",
-	"maxFieldsetsDescription": "Hvor mange fieldsets er tilladt? Hvis der skrives '1' vil deaktivere kontrollerne. Som standard er det ubegrænset.",
-	"enableMultipleFieldsets": "Aktivér flere Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Tillader flere typer af fieldsets i denne archetype.",
-	"hideFieldsetToolbar": "Skjul Fieldset værktøjslinie?",
-	"hideFieldsetToolbarDescription": "Skjuler den fieldset værktøjslinie der fremkommer når der findes mere end ét fieldset.",
-	"customWrapperClass": "Egen Wrapper Class",
-	"customWrapperClassDescription": "(Mulighed) Angiv din egen CSS class som tilføjes på wrapper div'en.",
-	"cssFile": "CSS fil",
-	"cssFileDescription": "(Mulighed) Tilføj en sti til din egen CSS fil der skal inkluderes på siden.",
-	"jsFile": "JavaScript fil",
-	"jsFileDescription": "(Mulighed) Tilføj en sti til din egen JavaScript fil der skal inkluderes på siden.",
-	"toggleDeveloperMode": "Slå udvikler muligheder til/fra.",
-	"toggleDeveloperModeDescription": "Aktivér på udvikler muligheder.",
-	"configModel": "Konfigurationsmodel",
-	"configModelDescription": "Vær forsigt med at redigere teksten for neden, den kontrollerer skemaet for denne archetype.",
-	"helpText": "Hjælpe tekst",
-	"defaultValue": "Standard værdi",
-	"dataType": "Datatype",
-	"required": "Påkrævet",
-	"regEx": "RegEx validering",
-	"properties": "Egenskaber",
-	"labelTemplate": "Label skabelon",
-	"select": "Vælg",
-	"icon": "Ikon",
-	"enableDisabling": "Aktivér fieldset-deaktivering?",
-	"enableDisablingDescription": "Tillad brugere at aktivere/deaktivere individuelle fieldsets."
-}

app/langs/de-de.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/en-gb.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias", 
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/en-us.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/es-es.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/fr-fr.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/he-il.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/it-it.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/ja-jp.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/ko-kr.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/nb-no.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/nl-nl.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/pl-pl.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/pt-br.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/ru-ru.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/sv-se.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/langs/zh-cn.js

@@ -1,37 +0,0 @@
-{
-	"label": "Label",
-	"alias": "Alias",
-	"hideFieldsetControls": "Hide Fieldset Controls?",
-	"hideFieldsetControlsDescription": "Hides the fieldset add/remove/sort controls.",
-	"toggleAdvanced": "Toggle Advanced Options",
-	"toggleAdvancedDescription": "Show advanced options.",
-	"hidePropertyLabels": "Hide Property Labels?",
-	"hidePropertyLabelsDescription": "Hides the property labels.",
-	"maxFieldsets": "Max Fieldsets",
-	"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
-	"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
-	"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
-	"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
-	"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
-	"customWrapperClass": "Custom Wrapper Class",
-	"customWrapperClassDescription": "(Optional) Enter a custom CSS class that will be applied to the wrapper div.",
-	"cssFile": "CSS File",
-	"cssFileDescription": "(Optional) Enter a path for a custom CSS file to be included on the page.",
-	"jsFile": "JS File",
-	"jsFileDescription": "(Optional) Enter a path for a custom JS file to be included on the page.",
-	"toggleDeveloperMode": "Toggle Developer Mode",
-	"toggleDeveloperModeDescription": "Turn on for developer options.",
-	"configModel": "Config Model",
-	"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
-	"helpText": "Help Text",
-	"defaultValue": "Default Value",
-	"dataType": "DataType",
-	"required": "Required",
-	"regEx": "RegEx Validation",
-	"properties": "Properties",
-	"labelTemplate": "Label Template",
-	"select": "Select",
-	"icon": "Icon",
-	"enableDisabling": "Enable Fieldset Disabling?",
-	"enableDisablingDescription": "Allows fieldsets to be individually enabled/disabled."
-}

app/less/archetype.less

@@ -1,353 +0,0 @@
-.archetypeEditor {
-    width: 98%;
-
-    .dropdown-menu {
-        top: auto;
-    }
-
-    .controls-no-label {
-        padding: 10px;
-    }
-}
-
-.archetypeEditor fieldset{
-    border: 1px solid #dddddd;
-    padding: 0;
-    margin-bottom: 5px;
-    background-color: #f1f1f1;
-    clear: both;
-    display: inline-block;
-    width: 100%;
-}
-
-.archetypeEditor .archetypeFieldsetLabel {
-    position: relative;
-    width: 100%%;
-
-    .label-sub {
-        padding: 8px 0;
-        display: inline-block;
-        &.module-label {
-            width: 100%;
-        }
-    }
-
-    .dropdown-menu {
-        padding: 0;
-        border-radius: 0;
-        box-shadow: none;
-        margin-top: -10px;
-        margin-left: -200px;
-    }
-
-    span {
-        font-weight: bold;
-
-        &.menu-label { font-weight: normal; }
-    }
-
-    label:hover {
-        cursor: default;
-    }
-
-    &.enableCollapsing:hover {
-        cursor: pointer;
-
-        label  {
-            span {
-                text-decoration: underline;
-            }
-            &:hover {
-                cursor: pointer;
-            }
-        }
-    }
-
-    .caret {
-        margin: 8px 1px 0 15px;
-
-        &.caret-right {
-            border-bottom: 4px solid transparent;
-            border-top: 4px solid transparent;
-            border-left: 4px solid #000000;
-            content: "";
-            margin-top: 6px;
-        }
-    }
-
-    label{
-        margin-bottom: 0;
-        margin-left: 5px;
-        padding: 0;
-        span {
-            display: inline-block;
-        }
-        &.dimmed {
-            color: #d9d9d9;
-        }
-    }
-}
-
-.archetypeEditor .archetypeCollapser{
-    clear: both;
-    height: 100%;
-    padding-top: 12px;
-    background-color: #fff;
-    border-top: 1px solid silver;
-    border-radius: 0 0 0 5px;
-}
-
-.archetypeEditor .multiPropertyTextbox{
-    margin-bottom: 3px;
-}
-
-.archetypeEditor ul{
-    list-style: none;
-    margin-left: 0;
-}
-
-.archetypeEditor,
-.archetypeConfig {
-    .archetypeEditorControls {
-        float: right;
-
-        i {
-            cursor: pointer;
-            &.handle {
-                cursor: move;
-            }
-            &.dimmed {
-                color: #d9d9d9;
-            }
-        }
-    }
-}
-
-.archetypeEditor .archetypeEditorControls {
-    float: none;
-    position: absolute;
-    right: 15px;
-    top: 0;
-}
-
-.archetypeConfig .archetypeEditorControls {
-    float: right;
-}
-
-.archetypeEditor form {
-    margin-left:20px;
-
-    .control-label {
-        padding-top: 0 !important;
-    }
-}
-
-.archetypeEditor .archetypeProperty{
-    clear: both;
-    overflow: hidden;
-    margin-top: 3px;
-}
-
-.archetypeEditor .archetypeDeveloperModel
-{
-    font-family: monospace;
-    width: 98%;
-    min-height: 100px;
-    margin-bottom: 10px;
-    border: 1px solid red;
-}
-
-.archetypeEditor .archetypeFieldsetToolbar {
-    margin-bottom: 10px;
-    overflow: hidden;
-
-    li {
-        float: left;
-        padding: 2px 4px;
-        margin-right: 10px;
-        border: 1px solid #ddd;
-        cursor: pointer;
-    }
-}
-
-.archetypeEditor .archetypeFieldsetHeaderText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
-.archetypeEditor .archetypeFieldsetFooterText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
-.archetypeEditor .archetypeFieldsetHelpText{
-    clear:both;
-    margin-bottom: 3px;
-    font-size: 12px;
-}
-
-.archetypeConfig {
-    margin-bottom: 20px;
-}
-
-.archetypeConfig ul{
-    list-style: none;
-}
-
-.archetypeConfig li{
-    background-color: #fff;
-}
-
-.archetypeConfig label{
-    width: 120px;
-}
-
-.archetypeConfig .archetypeFieldsetWrapper{
-    border: 1px solid #ccc;
-    padding: 10px;
-    margin-bottom: 10px;
-}
-
-.archetypeConfig .archetypeFieldsetOption{
-    margin-bottom: 15px;
-    input[type=text]{
-        max-width: 300px;
-    }
-}
-
-.archetypeConfig .archetypeDeveloperModel {
-    font-family: monospace;
-    width: 88%;
-    margin: 5px 10px 10px;
-    height: 130px;
-}
-
-.archetypeConfig .archetypePropertiesWrapper {
-    border: 1px solid #ddd;
-    padding: 8px;
-    margin: -40px 10px 10px 140px;
-    max-width: 475px;
-
-    ul {
-        padding: 0;
-        margin: 0;
-    }
-
-    li {
-        padding: 10px;
-        margin-bottom: 10px;
-        background-color: #eee;
-
-        input[type=text] {
-            max-width: 190px;
-            width: auto;
-        }
-
-        select {
-            max-width: 160px;
-        }
-    }
-
-    li:last-child {
-        margin-bottom: 0;
-    }
-}
-
-.archetypeConfig .archetypeFieldsets {
-    margin-left: 0;
-}
-
-.archetypeConfig .archetypeFieldsetTitle {
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.archetypeConfig .archetypeOptions label{
-    width: 400px;
-}
-
-.archetypeConfig .archetypeAdvancedOptions {
-    margin-top: 15px;
-    div {
-        margin-bottom: 10px;
-    }
-    label {
-        width: 400px;
-    }
-}
-
-.archetypeConfig .archetypeMaxFieldsets{
-    border: 1px solid #ddd;
-    width: 40px;
-    text-align: right;
-}
-
-.archetypeConfig .archetypePropertyTitle {
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.archetypeConfig .archetypePropertyCollapser{
-    margin-top: 10px;
-    div {
-        margin-bottom: 10px;
-    }
-}
-
-.archetypeEditor .archetypeFieldsetError{
-    border: 1px solid #b94a48;
-}
-
-.archetypeEditor .archetypeProperty {
-    label {
-        span {
-            color: #343434;
-        }
-        &.dimmed span {
-            color: #d9d9d9;
-        }
-
-    }
-}
-.archetypeEditor .archetypePropertyError{
-    margin-bottom: 5px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-
-    label {
-
-        span {
-            color: #b94a48;
-            font-weight: bold;
-        }
-    }
-}
-
-.archetypeEditor .archetypeAddButton:hover {
-    text-decoration: none;
-
-    .archetypeAddButtonText {
-        text-decoration: underline;
-    }
-}
-
-.ui-sortable-placeholder {
-    visibility: visible !important;
-    background-color:   #d0e7f1 !important;
-}
-
-.archetypeConfig .archetypeFieldsetCollapser {
-    margin-top: 15px;
-}
-
-.archetypeConfig .fieldsetIcon {
-    margin-right: 10px;
-}
-
-.archetypeEditor .show-validation.ng-invalid .control-group.error .control-label {
-    span {
-        color: #343434;
-    }
-}

app/resources/propertyeditor.js

@@ -1,29 +0,0 @@
-angular.module('umbraco.resources').factory('archetypePropertyEditorResource', function($q, $http, umbRequestHelper){
-    return { 
-        getAllDataTypes: function() {
-            // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet
-            return umbRequestHelper.resourcePromise(
-                $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
-            );
-        },
-        getDataType: function(guid) {
-        	return umbRequestHelper.resourcePromise(
-        		$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid), 'Failed to retrieve datatype'
-    		);
-        },
-        getPropertyEditorMapping: function(alias) {
-            return umbRequestHelper.resourcePromise(
-                $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAllPropertyEditors"), 'Failed to retrieve datatype mappings'
-            ).then(function (data) {
-                var result = _.find(data, function(d) {
-                    return d.alias === alias;
-                });
-
-                if (result != null) 
-                    return result;
-
-                return "";
-            });
-        }
-    }
-}); 

app/services/localization.js

@@ -1,42 +0,0 @@
-angular.module('umbraco.services').factory('archetypeLocalizationService', function($http, $q, userService){
-    var service = {
-        resourceFileLoaded: false,
-        dictionary: {},
-        localize: function(key) {
-            var deferred = $q.defer();
-
-            if(service.resourceFileLoaded){
-                var value = service._lookup(key);
-                deferred.resolve(value);
-            }
-            else{
-                service.initLocalizedResources().then(function(dictionary){
-                   var value = service._lookup(key);
-                   deferred.resolve(value); 
-                });
-            } 
-
-            return deferred.promise;
-        },
-        _lookup: function(key){
-            return service.dictionary[key];
-        },
-        initLocalizedResources:function () {
-            var deferred = $q.defer();
-            userService.getCurrentUser().then(function(user){
-                $http.get("/App_plugins/Archetype/langs/" + user.locale + ".js") 
-                    .then(function(response){
-                        service.resourceFileLoaded = true;
-                        service.dictionary = response.data;
-
-                        return deferred.resolve(service.dictionary);
-                    }, function(err){
-                        return deferred.reject("Lang file missing");
-                    });
-            });
-            return deferred.promise;
-        }
-    }
-
-    return service;
-});

app/views/archetype.config.html

@@ -1,145 +0,0 @@
-<div class="archetypeConfig" ng-controller="Imulus.ArchetypeConfigController">
-    <ul class="archetypeFieldsets" ui-sortable="sortableOptions" ng-model="archetypeConfigRenderModel.fieldsets">
-        <li ng-repeat="fieldset in archetypeConfigRenderModel.fieldsets" ng-hide="fieldset.remove">
-            <div class="archetypeFieldsetWrapper" >
-                <div class="archetypeEditorControls" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
-                    <i class="icon icon-add" ng-click="addFieldsetRow($index, $event)"></i>
-                    <i class="icon icon-delete" ng-click="removeFieldsetRow($index)" ng-show="canRemoveFieldset()"></i>
-                    <i class="icon icon-navigation handle" ng-show="canSortFieldset()"></i>
-                </div>
-                <div class="archetypeFieldsetTitle" ng-click="focusFieldset(fieldset)">{{fieldset.label}}</div>
-                <div class="archetypeFieldsetCollapser" ng-hide="fieldset.collapse && fieldset.label">
-                    <div class="archetypeFieldsetOption">
-                        <label for="archetypeFieldLabel_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                        <input type="text" id="archetypeFieldLabel_{{$index}}" ng-model="fieldset.label" on-keyup="autoPopulateAlias(this)" />
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label for="archetypeFieldAlias_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                        <input type="text" id="archetypeFieldAlias_{{$index}}" ng-model="fieldset.alias" on-keyup="markAliasDirty(this)" required/>
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label for="archetypeFieldLabelTemplate_{{$index}}"><archetype-localize key="labelTemplate">Label Template</archetype-localize></label>
-                        <input type="text" id="archetypeFieldLabelTemplate_{{$index}}" ng-model="fieldset.labelTemplate" />
-                    </div>
-                    <div class="archetypeFieldsetOption" ng-show="archetypeConfigRenderModel.enableMultipleFieldsets">
-                        <label for="archetypeFieldIcon_{{$index}}"><archetype-localize key="icon">Icon</archetype-localize></label>
-                        <i class="fieldsetIcon icon ng-class:fieldset.icon"></i><a ng-click="selectIcon(fieldset)"><archetype-localize key="select">Select</archetype-localize>…</a>
-                    </div>
-                    <div class="archetypeFieldsetOption">
-                        <label><archetype-localize key="properties">Properties</archetype-localize></label>
-                    </div>
-                    <div class="archetypePropertiesWrapper">
-                        <ul ui-sortable="sortableOptions" ng-model="fieldset.properties">
-                            <li ng-repeat="property in fieldset.properties" ng-hide="property.remove">
-                                <div class="archetypeEditorControls">
-                                    <i class="icon icon-add" ng-click="addPropertyRow(fieldset, $index)"></i>
-                                    <i class="icon icon-delete" ng-click="removePropertyRow(fieldset, $index)" ng-show="canRemoveProperty(fieldset)"></i>
-                                    <i class="icon icon-navigation handle" ng-show="canSortProperty(fieldset)"></i>
-                                </div>
-                                <div class="archetypePropertyTitle" ng-click="focusProperty(fieldset.properties, property)">
-                                    {{property.label}} ({{property.alias}}) - <span>{{getDataTypeNameByGuid(property.dataTypeGuid)}}</span>
-                                </div>
-                                <div class="archetypePropertyCollapser" ng-hide="property.collapse && property.label">
-                                    <div>
-                                        <label for="archetypePropertyLabel_{{$parent.$index}}_{{$index}}"><archetype-localize key="label">Label</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyLabel_{{$parent.$index}}_{{$index}}" ng-model="property.label" on-keyup="autoPopulateAlias(this)"/>
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyAlias_{{$parent.$index}}_{{$index}}"><archetype-localize key="alias">Alias</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyAlias_{{$parent.$index}}_{{$index}}" ng-model="property.alias" on-keyup="markAliasDirty(this)" required/>
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}"><archetype-localize key="helpText">Help Text</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyHelpText_{{$parent.$index}}_{{$index}}" ng-model="property.helpText" />
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyDataType_{{$parent.$index}}_{{$index}}"><archetype-localize key="dataType">Datatype</archetype-localize></label>
-                                        <select id="archetypePropertyDataType_{{$parent.$index}}_{{$index}}" ng-model="property.dataTypeGuid" ng-options="datatype.guid as datatype.name for datatype in availableDataTypes | orderBy:'name'"></select>
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}"><archetype-localize key="defaultValue">Default Value</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyDefaultValue_{{$parent.$index}}_{{$index}}" ng-model="property.value" />
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyRequired_{{$parent.$index}}_{{$index}}"><archetype-localize key="required">Required</archetype-localize></label>
-                                        <input type="checkbox" id="archetypePropertyRequired_{{$parent.$index}}_{{$index}}" ng-model="property.required" />
-                                    </div>
-                                    <div>
-                                        <label for="archetypePropertyRegEx_{{$parent.$index}}_{{$index}}"><archetype-localize key="regEx">RegEx Validation</archetype-localize></label>
-                                        <input type="text" id="archetypePropertyRegExValue_{{$parent.$index}}_{{$index}}" ng-model="property.regEx" />
-                                    </div>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </li>
-    </ul>
-
-    <div class="archetypeOptions">
-        <div>
-            <label for="archetypeOptionsToggle"><archetype-localize key="toggleAdvanced">Toggle Advanced Options</archetype-localize><small><archetype-localize key="toggleAdvancedDescription">Show advanced options.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeOptionsToggle" ng-model="archetypeConfigRenderModel.showAdvancedOptions"/>
-        </div>
-    </div>
-
-    <div class="archetypeAdvancedOptions" ng-show="archetypeConfigRenderModel.showAdvancedOptions">
-        <div>
-            <label for="archetypeAdvancedOptionsStartWithAddButton"><archetype-localize key="startWithAddButton">Start With Add Button?</archetype-localize><small><archetype-localize key="startWithAddButtonDescription">Empty property shows an add button instead of providing a default fieldset.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsStartWithAddButton" ng-model="archetypeConfigRenderModel.startWithAddButton"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsHideControls"><archetype-localize key="hideFieldsetControls">Hide Fieldset Controls?</archetype-localize><small><archetype-localize key="hideFieldsetControlsDescription">Hides the fieldset add/remove/sort controls.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsHideControls" ng-model="archetypeConfigRenderModel.hideFieldsetControls"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsHideLabels"><archetype-localize key="hidePropertyLabels">Hide Property Labels?</archetype-localize><small><archetype-localize key="hidePropertyLabelsDescription">Hides the property labels.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsHideLabels" ng-model="archetypeConfigRenderModel.hidePropertyLabels"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsMaxFieldsets"><archetype-localize key="maxFieldsets">Max Fieldsets</archetype-localize><small><archetype-localize key="maxFieldsetsDescription">How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.</archetype-localize></small></label>
-            <input type="number" id="archetypeAdvancedOptionsMaxFieldsets" class="archetypeMaxFieldsets" ng-model="archetypeConfigRenderModel.maxFieldsets"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsMultipleFieldsets"><archetype-localize key="enableMultipleFieldsets">Enable Multiple Fieldsets?</archetype-localize><small><archetype-localize key="enableMultipleFieldsetsDescription">Allows multiple types of fieldsets within this archetype.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsMultipleFieldsets" ng-model="archetypeConfigRenderModel.enableMultipleFieldsets"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCollapsing"><archetype-localize key="enableCollapsing">Enable Collapsing?</archetype-localize><small><archetype-localize key="enableCollapsingDescription">Enable fieldset collapsing.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsCollapsing" ng-model="archetypeConfigRenderModel.enableCollapsing"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsDisabling"><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="archetypeConfigRenderModel.enableDisabling" />
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsFieldsetToolbar"><archetype-localize key="hideFieldsetToolbar">Hide Fieldset Toolbar?</archetype-localize><small><archetype-localize key="hideFieldsetToolbarDescription">Hides the fieldset toolbar that appears when more than one fieldset model appears.</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsFieldsetToolbar" ng-model="archetypeConfigRenderModel.hideFieldsetToolbar"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomClass"><archetype-localize key="customWrapperClass">Custom Wrapper Class</archetype-localize><small><archetype-localize key="customWrapperClassDescription">(Optional) Enter a custom CSS class that will be applied to the wrapper div.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomClass" ng-model="archetypeConfigRenderModel.customCssClass"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomCss"><archetype-localize key="cssFile">CSS File</archetype-localize><small><archetype-localize key="cssFileDescription">(Optional) Enter a path for a custom CSS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomCss" ng-model="archetypeConfigRenderModel.customCssPath"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomJs"><archetype-localize key="jsFile">JS File</archetype-localize><small><archetype-localize key="jsFileDescription">(Optional) Enter a path for a custom JS file to be included on the page.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomJs" ng-model="archetypeConfigRenderModel.customJsPath"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsCustomView"><archetype-localize key="viewFile">View File</archetype-localize><small><archetype-localize key="viewFileDescription">(Optional) Enter a path for a custom view file to be used to render this Archetype.</archetype-localize></small></label>
-            <input type="text" id="archetypeAdvancedOptionsCustomView" ng-model="archetypeConfigRenderModel.customViewPath"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsDeveloperMode"><archetype-localize key="toggleDeveloperMode">Toggle Developer Mode</archetype-localize><small><archetype-localize key="toggleDeveloperModeDescription">Toggle Developer Mode</archetype-localize></small></label>
-            <input type="checkbox" id="archetypeAdvancedOptionsDeveloperMode" ng-model="archetypeConfigRenderModel.developerMode"/>
-        </div>
-        <div>
-            <label for="archetypeAdvancedOptionsConfigModel"><archetype-localize key="configModel">Config Model</archetype-localize><small><archetype-localize key="configModelDescription">Be careful editing the text below, it controls the schema for this archetype.</archetype-localize></small></label>
-            <textarea class="archetypeDeveloperModel" id="archetypeAdvancedOptionsConfigModel" ng-model="archetypeConfigRenderModel"></textarea>
-        </div>
-    </div>
-</div>

app/views/archetype.default.html

@@ -1,63 +0,0 @@
-<div class="archetypeEditor ng-class:model.config.customCssClass">
-    <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="model.value"></textarea>
-    <ul ui-sortable="sortableOptions" ng-model="model.value.fieldsets" ng-show="!showAddButton()">
-        <li ng-repeat="fieldset in model.value.fieldsets">
-            <fieldset ng-class="[fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : '')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
-                <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing}">
-                    <div ng-click="focusFieldset(fieldset)" class="label-sub module-label">
-                        <span class="caret" ng-hide="fieldset.collapse || !model.config.enableCollapsing"></span>
-                        <span class="caret caret-right" ng-show="fieldset.collapse && model.config.enableCollapsing"></span>
-                        <label ng-class="{dimmed: fieldset.disabled}">
-                            <i class="fieldsetIcon icon ng-class:fieldsetConfigModel.icon"></i>
-                            <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
-                        </label>
-                    </div>
-                    <div class="archetypeEditorControls label-sub" ng-hide="model.config.hideFieldsetControls">
-                        <i class="icon icon-add dropdown-toggle" ng-show="canAdd()" data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(fieldset.alias, $index) : return"></i>
-                        <ul class="dropdown-menu umb-actions">
-                            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, $parent.$index)">
-                                <a>
-                                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
-                                    <span class="menu-label">{{fieldsetModel.label}}</span>
-                                </a>
-                            </li>
-                        </ul>
-                        <i class="icon icon-remove" ng-click="removeRow($index)" ng-show="canRemove()"></i>
-                        <i class="icon icon-power" ng-class="{dimmed: fieldset.disabled}" ng-click="enableDisable(fieldset)" ng-show="canDisable()"></i>
-                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
-                    </div>
-                </div>
-                <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
-                    <form class="form-inline">
-                        <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
-                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-f{{$parent.$index}}-{{property.alias}}-p{{$index}}">
-                                <span>{{property.label}}</span>
-                                <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
-                                    <small>{{property.helpText}}</small>
-                                </div>
-                            </label>
-
-                            <div class="controls">
-                                <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-form = "form"></archetype-property>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </fieldset>
-        </li>
-    </ul>
-    <div ng-show="showAddButton()">
-        <a data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(model.config.fieldsets[0].alias, 0) : return" prevent-default>
-            <i class="icon icon-add dropdown-toggle"></i>
-            <localize key="general_add" class="archetypeAddButtonText">Add</localize>
-        </a>
-        <ul class="dropdown-menu umb-actions">
-            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, 0)">
-                <a>
-                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
-                    <span class="menu-label">{{fieldsetModel.label}}</span>
-                </a>
-            </li>
-        </ul>
-    </div>
-</div>

app/views/archetype.html

@@ -1 +0,0 @@
-<div archetype-custom-view ng-controller="Imulus.ArchetypeController"></div>

config/meta.json

@@ -1,9 +0,0 @@
-{
-	"name": "Archetype",
-	"version": "1.3.0-beta",
-	"url": "http://github.com/imulus/archetype/",
-	"author": "Imulus",
-	"authorUrl": "http://imulus.com/",
-	"license": "MIT",
-	"licenseUrl": "http://opensource.org/licenses/MIT"
-}

config/package.nuspec

@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-        <metadata>
-                <id>Archetype</id>
-                <version><%= version %></version>
-                <title><%= name %></title>
-                <authors>imulus, kgiszewski, tomfulton</authors>
-                <owners>imulus, kgiszewski, tomfulton</owners>
-                <projectUrl>http://github.com/imulus/archetype</projectUrl>
-                <description><![CDATA[Archetype for Umbraco]]></description>
-                <tags>umbraco</tags>
-                <iconUrl>http://github.com/imulus/archetype/raw/master/assets/logo.png</iconUrl>
-                <licenseUrl><%= licenseUrl %></licenseUrl>
-        </metadata>
-</package>

config/package.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<umbPackage>
-  <info>
-    <package>
-      <name><%= name %></name>
-      <version><%= version %></version>
-      <license url="<%= licenseUrl %>"><%= license %></license>
-      <url><%= url %></url>
-      <requirements>
-        <major>0</major>
-        <minor>0</minor>
-        <patch>0</patch>
-      </requirements>
-    </package>
-    <author>
-      <name><%= author %></name>
-      <website><%= authorUrl %></website>
-    </author>
-    <readme><![CDATA[<%= readmeContents %>]]></readme>
-  </info>
-  <DocumentTypes />
-  <Templates />
-  <Stylesheets />
-  <Macros />
-  <DictionaryItems />
-  <Languages />
-  <DataTypes />
-  <control />
-  <Actions />
-  <files>
-  	<% files.forEach(function(file) { %>
-  	<file>
-      <guid><%= file.guid %>.<%= file.ext %></guid>
-      <orgPath><%= file.dir %></orgPath>
-      <orgName><%= file.name %></orgName>
-    </file>
-	<% }); %>
-  </files>
-</umbPackage>