Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/Caching
Browse files Browse the repository at this point in the history 
Conflicts:
	Source/Glass.Mapper.Sc/Glass.Mapper.Sc.csproj
	Source/Glass.Mapper.Sc/GlassConfig.cs
	Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration.Tds/Glass.Mapper.Sc.Integration.Tds.scproj
	Tests/Integration Tests/Sitecore/Glass.Mapper.Sc.Integration/Glass.Mapper.Sc.Integration.csproj
  • Loading branch information
gravypower committed Jan 2, 2013
2 parents a545abd + 8fdd092 commit 5efcdf6
Show file tree
Hide file tree
Showing 76 changed files with 5,063 additions and 138 deletions.
111 changes: 111 additions & 0 deletions Glass.Mapper - Sitecore.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{5D6EA9DE-3C8B-4381-82EF-4824DED2BA58}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sites", "Sites", "{53D4AA07-205B-47B7-B040-F29F82855772}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sitecore", "Sitecore", "{3A907A16-C131-4B03-A819-5962866C875E}"
ProjectSection(SolutionItems) = preProject
Sites\Sitecore\Setup.txt = Sites\Sitecore\Setup.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sites.Sc", "Sites\Sitecore\Glass.Mapper.Sites.Sc\Glass.Mapper.Sites.Sc.csproj", "{C6E8F5C7-7D3C-4492-B38B-707A885B7D27}"
EndProject
Project("{CAA73BB0-EF22-4D79-A57E-DF67B3BA9C80}") = "Glass.Mapper.Sites.Sc.Tds", "Sites\Sitecore\Glass.Mapper.Sites.Sc.Tds\Glass.Mapper.Sites.Sc.Tds.scproj", "{90D86CFB-1744-4D9D-A294-A5B64618DC50}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{AE1024DD-D8C9-4068-B183-6DB114888D39}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration Tests", "Integration Tests", "{D213393F-AC22-4424-A982-1B66D09AB9B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sitecore", "Sitecore", "{CD5D2D4B-47EF-47D6-B863-F3C9BD98EB8E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sc.Integration", "Tests\Integration Tests\Sitecore\Glass.Mapper.Sc.Integration\Glass.Mapper.Sc.Integration.csproj", "{ED059096-C6AC-42AA-B0B2-74104E1AF861}"
EndProject
Project("{CAA73BB0-EF22-4D79-A57E-DF67B3BA9C80}") = "Glass.Mapper.Sc.Integration.Tds", "Tests\Integration Tests\Sitecore\Glass.Mapper.Sc.Integration.Tds\Glass.Mapper.Sc.Integration.Tds.scproj", "{FEE6B0E9-B4A4-404C-9236-4396B2261C17}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper", "Source\Glass.Mapper\Glass.Mapper.csproj", "{566109ED-A88A-467E-BDDB-BBF7F831A006}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sc", "Source\Glass.Mapper.Sc\Glass.Mapper.Sc.csproj", "{0B8E0B06-46B8-4794-862F-73B391F8B1A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sc.Upgrade", "Source\Glass.Mapper.Sc.Upgrade\Glass.Mapper.Sc.Upgrade.csproj", "{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sc.Website", "Source\Glass.Mapper.Sc.Website\Glass.Mapper.Sc.Website.csproj", "{93420975-6370-4E1F-BC3C-9F9B4EEECEB1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{B3AD5A1C-51FC-4D1A-9C3F-80C79B173B77}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Tests", "Tests\Unit Tests\Glass.Mapper.Tests\Glass.Mapper.Tests.csproj", "{728CF1A7-0F06-4464-B434-33A982D97C82}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sc.Tests", "Tests\Unit Tests\Glass.Mapper.Sc.Tests\Glass.Mapper.Sc.Tests.csproj", "{38DB0F01-9232-45BE-BC14-8DEDB738D538}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C6E8F5C7-7D3C-4492-B38B-707A885B7D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C6E8F5C7-7D3C-4492-B38B-707A885B7D27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C6E8F5C7-7D3C-4492-B38B-707A885B7D27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C6E8F5C7-7D3C-4492-B38B-707A885B7D27}.Release|Any CPU.Build.0 = Release|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Release|Any CPU.Build.0 = Release|Any CPU
{90D86CFB-1744-4D9D-A294-A5B64618DC50}.Release|Any CPU.Deploy.0 = Release|Any CPU
{ED059096-C6AC-42AA-B0B2-74104E1AF861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED059096-C6AC-42AA-B0B2-74104E1AF861}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED059096-C6AC-42AA-B0B2-74104E1AF861}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED059096-C6AC-42AA-B0B2-74104E1AF861}.Release|Any CPU.Build.0 = Release|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Release|Any CPU.Build.0 = Release|Any CPU
{FEE6B0E9-B4A4-404C-9236-4396B2261C17}.Release|Any CPU.Deploy.0 = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Debug|Any CPU.Build.0 = Debug|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Release|Any CPU.ActiveCfg = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Release|Any CPU.Build.0 = Release|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B8E0B06-46B8-4794-862F-73B391F8B1A1}.Release|Any CPU.Build.0 = Release|Any CPU
{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF}.Release|Any CPU.Build.0 = Release|Any CPU
{93420975-6370-4E1F-BC3C-9F9B4EEECEB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93420975-6370-4E1F-BC3C-9F9B4EEECEB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93420975-6370-4E1F-BC3C-9F9B4EEECEB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93420975-6370-4E1F-BC3C-9F9B4EEECEB1}.Release|Any CPU.Build.0 = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.Build.0 = Release|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38DB0F01-9232-45BE-BC14-8DEDB738D538}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{566109ED-A88A-467E-BDDB-BBF7F831A006} = {5D6EA9DE-3C8B-4381-82EF-4824DED2BA58}
{0B8E0B06-46B8-4794-862F-73B391F8B1A1} = {5D6EA9DE-3C8B-4381-82EF-4824DED2BA58}
{AFC35AE3-307B-43BC-A9B8-9BCFB4EA3CCF} = {5D6EA9DE-3C8B-4381-82EF-4824DED2BA58}
{93420975-6370-4E1F-BC3C-9F9B4EEECEB1} = {5D6EA9DE-3C8B-4381-82EF-4824DED2BA58}
{3A907A16-C131-4B03-A819-5962866C875E} = {53D4AA07-205B-47B7-B040-F29F82855772}
{C6E8F5C7-7D3C-4492-B38B-707A885B7D27} = {3A907A16-C131-4B03-A819-5962866C875E}
{90D86CFB-1744-4D9D-A294-A5B64618DC50} = {3A907A16-C131-4B03-A819-5962866C875E}
{D213393F-AC22-4424-A982-1B66D09AB9B5} = {AE1024DD-D8C9-4068-B183-6DB114888D39}
{B3AD5A1C-51FC-4D1A-9C3F-80C79B173B77} = {AE1024DD-D8C9-4068-B183-6DB114888D39}
{CD5D2D4B-47EF-47D6-B863-F3C9BD98EB8E} = {D213393F-AC22-4424-A982-1B66D09AB9B5}
{ED059096-C6AC-42AA-B0B2-74104E1AF861} = {CD5D2D4B-47EF-47D6-B863-F3C9BD98EB8E}
{FEE6B0E9-B4A4-404C-9236-4396B2261C17} = {CD5D2D4B-47EF-47D6-B863-F3C9BD98EB8E}
{728CF1A7-0F06-4464-B434-33A982D97C82} = {B3AD5A1C-51FC-4D1A-9C3F-80C79B173B77}
{38DB0F01-9232-45BE-BC14-8DEDB738D538} = {B3AD5A1C-51FC-4D1A-9C3F-80C79B173B77}
EndGlobalSection
EndGlobal
79 changes: 79 additions & 0 deletions Glass.Mapper - Umbraco.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{07AC460C-E621-4C3E-AEFE-CEA5E5B14532}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C0959749-C641-4740-869C-84F61B3B4BB5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration Tests", "Integration Tests", "{2B40DC7D-5AE0-4581-9250-836E875A29A2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{06F01B65-43F7-44E1-9923-2ACD43EF9A12}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umbraco", "Umbraco", "{D6F39B38-42BA-4227-A532-8C3E476F0FB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Umb.Integration", "Tests\Integration Tests\Umbraco\Glass.Mapper.Umb.Integration\Glass.Mapper.Umb.Integration.csproj", "{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Tests", "Tests\Unit Tests\Glass.Mapper.Tests\Glass.Mapper.Tests.csproj", "{728CF1A7-0F06-4464-B434-33A982D97C82}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Umb.Tests", "Tests\Unit Tests\Glass.Mapper.Umb.Tests\Glass.Mapper.Umb.Tests.csproj", "{5BE06222-6401-40C5-B6D2-617D4C35D99F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper", "Source\Glass.Mapper\Glass.Mapper.csproj", "{566109ED-A88A-467E-BDDB-BBF7F831A006}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Umb", "Source\Glass.Mapper.Umb\Glass.Mapper.Umb.csproj", "{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sites", "Sites", "{ECD5D385-5AAF-4ECD-81A8-62D92093365F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Umbraco", "Umbraco", "{D23F7DDD-85CF-410F-A755-4CFC07AA6830}"
ProjectSection(SolutionItems) = preProject
Sites\Umbraco\Setup.txt = Sites\Umbraco\Setup.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Mapper.Sites.Umb", "Sites\Umbraco\Glass.Mapper.Sites.Umb\Glass.Mapper.Sites.Umb.csproj", "{1CE133F3-FEAC-425C-A82A-87D57429BBEC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9}.Release|Any CPU.Build.0 = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{728CF1A7-0F06-4464-B434-33A982D97C82}.Release|Any CPU.Build.0 = Release|Any CPU
{5BE06222-6401-40C5-B6D2-617D4C35D99F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BE06222-6401-40C5-B6D2-617D4C35D99F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BE06222-6401-40C5-B6D2-617D4C35D99F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BE06222-6401-40C5-B6D2-617D4C35D99F}.Release|Any CPU.Build.0 = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Debug|Any CPU.Build.0 = Debug|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Release|Any CPU.ActiveCfg = Release|Any CPU
{566109ED-A88A-467E-BDDB-BBF7F831A006}.Release|Any CPU.Build.0 = Release|Any CPU
{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF}.Release|Any CPU.Build.0 = Release|Any CPU
{1CE133F3-FEAC-425C-A82A-87D57429BBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CE133F3-FEAC-425C-A82A-87D57429BBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CE133F3-FEAC-425C-A82A-87D57429BBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CE133F3-FEAC-425C-A82A-87D57429BBEC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{566109ED-A88A-467E-BDDB-BBF7F831A006} = {07AC460C-E621-4C3E-AEFE-CEA5E5B14532}
{7BFBD78C-70AF-45B3-83BD-B5F9B0DE2FBF} = {07AC460C-E621-4C3E-AEFE-CEA5E5B14532}
{2B40DC7D-5AE0-4581-9250-836E875A29A2} = {C0959749-C641-4740-869C-84F61B3B4BB5}
{06F01B65-43F7-44E1-9923-2ACD43EF9A12} = {C0959749-C641-4740-869C-84F61B3B4BB5}
{D6F39B38-42BA-4227-A532-8C3E476F0FB8} = {2B40DC7D-5AE0-4581-9250-836E875A29A2}
{728CF1A7-0F06-4464-B434-33A982D97C82} = {06F01B65-43F7-44E1-9923-2ACD43EF9A12}
{5BE06222-6401-40C5-B6D2-617D4C35D99F} = {06F01B65-43F7-44E1-9923-2ACD43EF9A12}
{F6C553A6-5021-4903-8EE2-9F3B0E23C5B9} = {D6F39B38-42BA-4227-A532-8C3E476F0FB8}
{D23F7DDD-85CF-410F-A755-4CFC07AA6830} = {ECD5D385-5AAF-4ECD-81A8-62D92093365F}
{1CE133F3-FEAC-425C-A82A-87D57429BBEC} = {D23F7DDD-85CF-410F-A755-4CFC07AA6830}
EndGlobalSection
EndGlobal
17 changes: 12 additions & 5 deletions ...ation/master/sitecore/content/Tests/DataMappers/AbstractSitecoreFieldMapper/MapToCms.item
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ templatekey: DataMappersSingleField
----version----
language: en
version: 1
revision: 10ad90c1-04e0-47a9-b6ea-b04898894dfb
revision: 82fdbb79-74ec-4f4b-91db-32645319ab47

----field----
field: {6B43481F-F129-4F53-BEEE-EA84F9B1A6D4}
name: Field
key: field
content-length: 14

test value set
----field----
field: {52807595-0F8F-4B20-8D2A-CB71D28C6103}
name: __Owner
Expand Down Expand Up @@ -41,18 +48,18 @@ name: __Revision
key: __revision
content-length: 36

10ad90c1-04e0-47a9-b6ea-b04898894dfb
82fdbb79-74ec-4f4b-91db-32645319ab47
----field----
field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522}
name: __Updated
key: __updated
content-length: 34

20121216T214506:634912911063321174
20121230T212310:634924993906093380
----field----
field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}
name: __Updated by
key: __updated by
content-length: 14
content-length: 17

sitecore\admin
default\Anonymous
17 changes: 12 additions & 5 deletions .../master/sitecore/content/Tests/DataMappers/AbstractSitecoreFieldMapper/MapToProperty.item
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ templatekey: DataMappersSingleField
----version----
language: en
version: 1
revision: 77b1b8cc-698b-4836-ae48-b2aab9e83835
revision: 95489c06-c3d5-4940-bba6-295c396218d4

----field----
field: {6B43481F-F129-4F53-BEEE-EA84F9B1A6D4}
name: Field
key: field
content-length: 10

test value
----field----
field: {52807595-0F8F-4B20-8D2A-CB71D28C6103}
name: __Owner
Expand Down Expand Up @@ -41,18 +48,18 @@ name: __Revision
key: __revision
content-length: 36

77b1b8cc-698b-4836-ae48-b2aab9e83835
95489c06-c3d5-4940-bba6-295c396218d4
----field----
field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522}
name: __Updated
key: __updated
content-length: 34

20121216T204049:634912872495975248
20121216T214532:634912911320045857
----field----
field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}
name: __Updated by
key: __updated by
content-length: 14
content-length: 17

sitecore\admin
default\Anonymous
10 changes: 5 additions & 5 deletions ...per.Sites.Sc/data/serialization/master/sitecore/content/Tests/DataMappers/New Folder.item
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----item----
version: 1
id: {BBDEFFA7-3786-4912-9841-5BE590D6BFF7}
id: {7D7BB7F6-938D-4716-A6CA-1BA5E6A5868F}
database: master
path: /sitecore/content/Tests/DataMappers/New Folder
parent: {949328F9-AB43-4AA8-9B09-B3FF0C0F1C7B}
Expand All @@ -12,15 +12,15 @@ templatekey: Folder
----version----
language: en
version: 1
revision: 2488ea55-d46f-4532-8a4d-58f1d75617a7
revision: f25cda0d-3e61-4be8-9101-5ced63d7aefa

----field----
field: {25BED78C-4957-4165-998A-CA1B52F67497}
name: __Created
key: __created
content-length: 15

20121223T182658
20130101T121838
----field----
field: {5DD74568-4D4B-44C1-B513-0AF5F4CDA34F}
name: __Created by
Expand All @@ -34,14 +34,14 @@ name: __Revision
key: __revision
content-length: 36

2488ea55-d46f-4532-8a4d-58f1d75617a7
f25cda0d-3e61-4be8-9101-5ced63d7aefa
----field----
field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522}
name: __Updated
key: __updated
content-length: 34

20121223T182658:634918840187006727
20130101T121838:634926395187392908
----field----
field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}
name: __Updated by
Expand Down
2 changes: 1 addition & 1 deletion Source/Glass.Mapper.Sc/Configuration/Attributes/SitecoreNodeAttribute.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Glass.Mapper.Sc.Configuration.Attributes
{
public class SitecoreNodeAttribute : NodeAttribute
{
public SitecoreNodeAttribute():base(typeof(Guid))
public SitecoreNodeAttribute():base()
{
}

Expand Down
1 change: 0 additions & 1 deletion Source/Glass.Mapper.Sc/DataMappers/SitecoreChildrenMapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public override object MapToProperty(AbstractDataMappingContext mappingContext)
typeof (LazyItemEnumerable<>),
new[] {genericType},
getItems,
scConfig.PropertyInfo.PropertyType,
scConfig.IsLazy,
scConfig.InferType,
scContext.Service
Expand Down
18 changes: 18 additions & 0 deletions Source/Glass.Mapper.Sc/DataMappers/SitecoreFieldNullableMapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,22 @@ public override void Setup(DataMapperResolverArgs args)
base.Setup(args);
}
}

public class SitecoreFieldNullableDateTimeMapper :
SitecoreFieldNullableMapper<DateTime, SitecoreFieldDateTimeMapper> { }

public class SitecoreFieldNullableDecimalMapper :
SitecoreFieldNullableMapper<Decimal, SitecoreFieldDecimalMapper> { }

public class SitecoreFieldNullableDoubleMapper :
SitecoreFieldNullableMapper<Double, SitecoreFieldDoubleMapper> { }

public class SitecoreFieldNullableFloatMapper :
SitecoreFieldNullableMapper<float, SitecoreFieldFloatMapper> { }

public class SitecoreFieldNullableGuidMapper :
SitecoreFieldNullableMapper<Guid, SitecoreFieldGuidMapper> { }

public class SitecoreFieldNullableIntMapper :
SitecoreFieldNullableMapper<int, SitecoreFieldIntegerMapper> { }
}
Loading

0 comments on commit 5efcdf6

Please sign in to comment.