Restructure Unicorn Item Serialization and Configuration

CONTRIBUTING.md

@@ -18,17 +18,16 @@ Fork, then clone the repo:
 git clone https://github.com/your-username/conjunction.git
 ```
 
-### Unicorn
+### Item Serialization
 
 The project uses [Unicorn](https://github.com/kamsar/Unicorn) to serialize Sitecore items related to Conjunction, i.e template items, settings etc. 
 
-In order to use Unicorn you need to do the following:
+To get the item serialization working, you must perform the following steps:
 
-1. Publish the Conjunction.Foundation.Content project, using a custom file system publish profile, to your local Sitecore instance
-2. Copy the ``Unicorn.CustomSerializationFolder.config.example`` file from the ``App_Config/Include/Unicorn`` folder to the ``App_Config/Include/z_Developer`` folder
-3. Rename the copied file to remove the ``.example`` extension
-4. Edit the file to point at the serialization folder beneath your working folder
-5. Run ``http://<yoursite>/unicorn.aspx`` and sync everything
+1. Publish the ``Conjunction.Foundation.Serialization`` and ``Conjunction.Foundation.Core`` projects, using a custom filesystem publish profile, to your local Sitecore instance (IIS webroot folder)
+2. In the local Sitecore instance, locate the file ``.\Website\App_Config\Include\Conjunction\Conjunction.Foundation.Serialization.DevSettings.config.example`` and remove the ``.example`` extension
+3. Edit the ``Conjunction.Foundation.Serialization.DevSettings.config`` file and set the ``sourceFolder`` variable to point to where the Conjunction source code is located on your machine (the working directory)
+4. Run ``http://<yoursite>/unicorn.aspx`` and sync everything
 
 ### Tests
 

Conjunction.sln

@@ -19,9 +19,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Mvc.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "src\Demo\Demo.csproj", "{D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Content", "Content", "{EE02835B-50B3-475D-BBE0-41A8F6C1942C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serialization", "{1B3BC778-B42F-4C5C-B244-04801A2C3696}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Content", "src\Foundation\Content\Conjunction.Foundation.Content\Conjunction.Foundation.Content.csproj", "{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conjunction.Foundation.Serialization", "src\Foundation\Serialization\Code\Conjunction.Foundation.Serialization.csproj", "{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,10 +49,10 @@ Global
 		{D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2BACCE4-7DC9-4E1F-AC2D-4DDA5FB66D35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28CFED63-5FE0-44A2-9CF0-86249F0FDC26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,7 +64,7 @@ Global
 		{27BEE52F-5DE6-4887-8456-E42A2DD42F0F} = {0891AA95-9CC7-4C2D-9922-E4D4E9A04DB1}
 		{03A41346-15BE-4D75-B908-D3F690B79290} = {9EECA02F-1826-4567-8890-797C67BB2AAC}
 		{E949F23D-566B-4549-80E4-6AB17F7F95C0} = {9EECA02F-1826-4567-8890-797C67BB2AAC}
-		{EE02835B-50B3-475D-BBE0-41A8F6C1942C} = {9F411CBB-A4C4-4A63-BB74-687CAB369285}
-		{28CFED63-5FE0-44A2-9CF0-86249F0FDC26} = {EE02835B-50B3-475D-BBE0-41A8F6C1942C}
+		{1B3BC778-B42F-4C5C-B244-04801A2C3696} = {9F411CBB-A4C4-4A63-BB74-687CAB369285}
+		{6B9BC81B-E2B1-47C5-B6DE-6901BEF9BE7A} = {1B3BC778-B42F-4C5C-B244-04801A2C3696}
 	EndGlobalSection
 EndGlobal

src/Demo/App_Config/Include/Demo/Demo.Serialization.config

@@ -0,0 +1,17 @@
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+  <sitecore>
+    <unicorn>
+      <configurations>
+        <configuration name="Conjunction.Demo" description="Conjunction Demo Content">
+          <targetDataStore physicalRootPath="$(sourceFolder)\Demo\Serialization" type="Rainbow.Storage.SerializationFileSystemDataStore, Rainbow" useDataCache="false" singleInstance="true" />
+          <predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true">
+            <include name="Demo.Templates" database="master" path="/sitecore/templates/ConjunctionDemo" />
+            <include name="Demo.Renderings" database="master" path="/sitecore/layout/Renderings/ConjunctionDemo" />
+            <include name="Demo.Layouts" database="master" path="/sitecore/layout/Layouts/ConjunctionDemo" />
+            <include name="Demo.Content" database="master" path="/sitecore/content/Home/Conjunction" />
+          </predicate>
+        </configuration>
+      </configurations>
+    </unicorn>
+  </sitecore>
+</configuration>

serialization/Conjunction Developer Content/Content/Conjunction.yml → src/Demo/Serialization/Demo.Content/Conjunction.yml

@@ -1,5 +1,5 @@
 ---
-ID: "0ceae273-d787-44f9-8211-b10f12b4f499"
+ID: "6ceba9b3-868e-4689-bb4f-31dd39021081"
 Parent: "110d559f-dea5-42ea-9c1c-8a5df7e70ef9"
 Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523"
 Path: /sitecore/content/Home/Conjunction
@@ -11,7 +11,7 @@ Languages:
     Fields:
     - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
       Hint: __Created
-      Value: 20170208T194114Z
+      Value: 20170211T210000Z
     - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
       Hint: __Created by
       Value: |

src/Demo/Serialization/Demo.Content/Conjunction/DemoPage.yml

@@ -0,0 +1,35 @@
+---
+ID: "d08feb05-afdf-4f48-ba94-a6337da982b6"
+Parent: "6ceba9b3-868e-4689-bb4f-31dd39021081"
+Template: "0642ef2f-a8c0-42d6-ac35-6ce9f11cc99a"
+Path: /sitecore/content/Home/Conjunction/DemoPage
+DB: master
+SharedFields:
+- ID: "f1a1fe9e-a60c-4ddb-a3a0-bb5b29fe732e"
+  Hint: __Renderings
+  Type: layout
+  Value: |
+    <r xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+      <d
+        id="{FE5D7FDF-89C0-4D99-9AA3-B5FBD009C9F3}"
+        l="{C352ECD3-A970-4F2D-9A1A-AA343525B8C4}">
+        <r
+          ds="{D6A82E1F-6687-495E-8243-D865B1BF28BA}"
+          id="{247F9DB2-EA73-4B6C-9258-62727E47DD89}"
+          par=""
+          ph="main"
+          uid="{BDD80AD8-28DA-45B6-802F-5277AAADB82F}" />
+      </d>
+    </r>
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20161108T124931Z
+    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
+      Hint: __Created by
+      Value: |
+        sitecore\admin

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries.yml

@@ -0,0 +1,18 @@
+---
+ID: "ae864216-b2a5-4414-9dd7-74ba19058c2d"
+Parent: "6ceba9b3-868e-4689-bb4f-31dd39021081"
+Template: "a87a00b1-e6db-45ab-8b54-636fec3b5523"
+Path: /sitecore/content/Home/Conjunction/SearchQueries
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20161116T203925Z
+    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
+      Hint: __Created by
+      Value: |
+        sitecore\admin

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root.yml

@@ -0,0 +1,14 @@
+---
+ID: "79135a99-3deb-4c86-a262-bdc0a8ea63b6"
+Parent: "ae864216-b2a5-4414-9dd7-74ba19058c2d"
+Template: "818a0ca7-1388-48bc-9e07-851314c288cb"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T193901Z

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A.yml

@@ -0,0 +1,14 @@
+---
+ID: "bd17817e-9c59-4f8c-a08d-a6883c73f53b"
+Parent: "79135a99-3deb-4c86-a262-bdc0a8ea63b6"
+Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T193919Z

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/C.yml

@@ -0,0 +1,14 @@
+---
+ID: "261aaee6-4e13-4210-be39-fefa3a204aa6"
+Parent: "bd17817e-9c59-4f8c-a08d-a6883c73f53b"
+Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A/C
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T194000Z

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/A/D.yml

@@ -0,0 +1,14 @@
+---
+ID: "f9f97ce3-12c4-4a47-b974-707c1f3b4b4a"
+Parent: "bd17817e-9c59-4f8c-a08d-a6883c73f53b"
+Template: "f6fdfd70-26d0-4472-a118-97b65a6bf189"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/A/D
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T194005Z

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B.yml

@@ -0,0 +1,14 @@
+---
+ID: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49"
+Parent: "79135a99-3deb-4c86-a262-bdc0a8ea63b6"
+Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T193924Z

src/Demo/Serialization/Demo.Content/Conjunction/SearchQueries/Search Query Root/B/E.yml

@@ -0,0 +1,14 @@
+---
+ID: "545ad188-3b8d-4bec-8b90-63803f73cd72"
+Parent: "738aca6b-5a6e-4100-aaf5-b188ef0a5c49"
+Template: "159d9956-aadc-4b31-9f70-39bf74e14bf1"
+Path: /sitecore/content/Home/Conjunction/SearchQueries/Search Query Root/B/E
+DB: master
+Languages:
+- Language: en
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20170103T193940Z