Skip to content

Commit df34f46

Browse files
hazzikhazzik
authored
Merge pull request #675 from ngbrown/NH-4073
NH-4073 - Replace NHibernate.Web.Example with modern version.
2 parents 59ba21f + b117e23 commit df34f46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+818
-512
lines changed

‎.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,16 @@ indent_style = tab
99

1010
[*.xsd]
1111
indent_style = tab
12+
13+
[*.json]
14+
indent_style = space
15+
indent_size = 2
16+
17+
[*.xml]
18+
indent_style = space
19+
indent_size = 2
20+
21+
22+
[*.cshtml]
23+
indent_style = space
24+
indent_size = 4

‎src/NHibernate.Everything.sln

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.12
4+
VisualStudioVersion = 15.0.26730.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support", "Support", "{9BDB5C84-14EC-4384-B423-9E319675B3CA}"
77
ProjectSection(FolderStartupServices) = postProject
@@ -58,44 +58,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration Templates", "
5858
{B4F97281-0DBD-4835-9ED8-7DFB966E87FF} = {B4F97281-0DBD-4835-9ED8-7DFB966E87FF}
5959
EndProjectSection
6060
EndProject
61-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate", "NHibernate\NHibernate.csproj", "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate", "NHibernate\NHibernate.csproj", "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}"
6262
EndProject
63-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.DomainModel", "NHibernate.DomainModel\NHibernate.DomainModel.csproj", "{5C649B55-1B3F-4C38-9998-1B043E94A244}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.DomainModel", "NHibernate.DomainModel\NHibernate.DomainModel.csproj", "{5C649B55-1B3F-4C38-9998-1B043E94A244}"
6464
EndProject
65-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Test", "NHibernate.Test\NHibernate.Test.csproj", "{7AEE5B37-C552-4E59-9B6F-88755BCB5070}"
65+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Test", "NHibernate.Test\NHibernate.Test.csproj", "{7AEE5B37-C552-4E59-9B6F-88755BCB5070}"
6666
EndProject
67-
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "NHibernate.Example.Web\", "{C5D6EE68-1760-4F97-AD31-42343593D8C1}"
68-
ProjectSection(WebsiteProperties) = preProject
69-
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1"
70-
ProjectReferences = "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}|NHibernate.dll;"
71-
Debug.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
72-
Debug.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"
73-
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\NHibernate.Example.Web\"
74-
Debug.AspNetCompiler.Updateable = "true"
75-
Debug.AspNetCompiler.ForceOverwrite = "true"
76-
Debug.AspNetCompiler.FixedNames = "false"
77-
Debug.AspNetCompiler.Debug = "True"
78-
Release.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
79-
Release.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"
80-
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\NHibernate.Example.Web\"
81-
Release.AspNetCompiler.Updateable = "true"
82-
Release.AspNetCompiler.ForceOverwrite = "true"
83-
Release.AspNetCompiler.FixedNames = "false"
84-
Release.AspNetCompiler.Debug = "False"
85-
VWDPort = "3041"
86-
SlnRelativePath = "NHibernate.Example.Web\"
87-
DefaultWebSiteLanguage = "Visual C#"
88-
EndProjectSection
89-
EndProject
90-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Tool.HbmXsd", "NHibernate.Tool.HbmXsd\NHibernate.Tool.HbmXsd.csproj", "{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}"
67+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Tool.HbmXsd", "NHibernate.Tool.HbmXsd\NHibernate.Tool.HbmXsd.csproj", "{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}"
9168
EndProject
92-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NHibernate.Test.VisualBasic", "NHibernate.Test.VisualBasic\NHibernate.Test.VisualBasic.vbproj", "{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}"
69+
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "NHibernate.Test.VisualBasic", "NHibernate.Test.VisualBasic\NHibernate.Test.VisualBasic.vbproj", "{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}"
9370
EndProject
9471
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AssemblyInfo", "AssemblyInfo", "{00C03FBC-6720-4917-A203-DEA12FF3C7BF}"
9572
ProjectSection(SolutionItems) = preProject
9673
SharedAssemblyInfo.cs = SharedAssemblyInfo.cs
9774
EndProjectSection
9875
EndProject
76+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Example.Web", "NHibernate.Example.Web\NHibernate.Example.Web.csproj", "{B291C1C1-599B-418E-8591-8A8CF1CAA188}"
77+
EndProject
9978
Global
10079
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10180
Debug|.NET = Debug|.NET
@@ -136,16 +115,6 @@ Global
136115
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Any CPU.Build.0 = Release|Any CPU
137116
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
138117
{7AEE5B37-C552-4E59-9B6F-88755BCB5070}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
139-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Debug|.NET.ActiveCfg = Debug|Any CPU
140-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
142-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
143-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
144-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|.NET.ActiveCfg = Debug|Any CPU
145-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
146-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Any CPU.Build.0 = Debug|Any CPU
147-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
148-
{C5D6EE68-1760-4F97-AD31-42343593D8C1}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
149118
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|.NET.ActiveCfg = Debug|Any CPU
150119
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
151120
{446E148D-A9D5-4D7D-A706-BEDD45B2BC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -165,6 +134,18 @@ Global
165134
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Any CPU.Build.0 = Release|Any CPU
166135
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
167136
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
137+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|.NET.ActiveCfg = Debug|Any CPU
138+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|.NET.Build.0 = Debug|Any CPU
139+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
140+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Any CPU.Build.0 = Debug|Any CPU
141+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
142+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
143+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|.NET.ActiveCfg = Release|Any CPU
144+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|.NET.Build.0 = Release|Any CPU
145+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Any CPU.ActiveCfg = Release|Any CPU
146+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Any CPU.Build.0 = Release|Any CPU
147+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
148+
{B291C1C1-599B-418E-8591-8A8CF1CAA188}.Release|Mixed Platforms.Build.0 = Release|Any CPU
168149
EndGlobalSection
169150
GlobalSection(SolutionProperties) = preSolution
170151
HideSolutionNode = FALSE
@@ -182,6 +163,9 @@ Global
182163
{7C2EF610-BCA0-4D1F-898A-DE9908E4970C} = {094F74CD-2DD7-496F-BC48-A6D357BF33FD}
183164
{00C03FBC-6720-4917-A203-DEA12FF3C7BF} = {9BDB5C84-14EC-4384-B423-9E319675B3CA}
184165
EndGlobalSection
166+
GlobalSection(ExtensibilityGlobals) = postSolution
167+
SolutionGuid = {A41913C2-EDEB-440A-BBDE-0AEB56C1CBA6}
168+
EndGlobalSection
185169
GlobalSection(TextTemplating) = postSolution
186170
TextTemplating = 1
187171
EndGlobalSection

‎src/NHibernate.Example.Web/App_Code/CurrentSessionModule.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/NHibernate.Example.Web/App_Code/Domain/Item.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/NHibernate.Example.Web/App_Code/ExampleApplication.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/NHibernate.Example.Web/App_Code/Persistence/ItemList.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/NHibernate.Example.Web/App_Data/Item.hbm.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Bin/Antlr3.Runtime.dll.refresh

-74 Bytes
Binary file not shown.

‎src/NHibernate.Example.Web/Bin/Iesi.Collections.dll.refresh

-78 Bytes
Binary file not shown.

‎src/NHibernate.Example.Web/Bin/log4net.dll.refresh

-52 Bytes
Binary file not shown.

‎src/NHibernate.Example.Web/Default.aspx

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Default.aspx.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Global.asax

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using NHibernate.Cfg;
2+
using NHibernate.Dialect;
3+
using NHibernate.Driver;
4+
using NHibernate.Example.Web.Models;
5+
using NHibernate.Mapping.ByCode;
6+
7+
namespace NHibernate.Example.Web.Infrastructure
8+
{
9+
public class AppSessionFactory
10+
{
11+
public Configuration Configuration { get; }
12+
public ISessionFactory SessionFactory { get; }
13+
14+
public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory)
15+
{
16+
NHibernate.LoggerProvider.SetLoggersFactory(new NHibernateToMicrosoftLoggerFactory(loggerFactory));
17+
18+
var mapper = new ModelMapper();
19+
mapper.AddMapping<ItemMap>();
20+
var domainMapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
21+
22+
Configuration = new Configuration();
23+
Configuration.DataBaseIntegration(db =>
24+
{
25+
db.ConnectionString = @"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true";
26+
db.Dialect<MsSql2008Dialect>();
27+
db.Driver<SqlClientDriver>();
28+
})
29+
.AddMapping(domainMapping);
30+
Configuration.SessionFactory().GenerateStatistics();
31+
32+
SessionFactory = Configuration.BuildSessionFactory();
33+
}
34+
35+
public ISession OpenSession()
36+
{
37+
return SessionFactory.OpenSession();
38+
}
39+
}
40+
}

0 commit comments

Comments
 (0)