Skip to content

Examples: remove stale Common.Logging config and legacy Northwind web.config variants #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lahma merged 1 commit into from
Nov 3, 2026
Merged

Examples: remove stale Common.Logging config and legacy Northwind web.config variants #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions ...Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Config/Log4Net.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ....Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
<ItemGroup>
<Content Include="App_Themes\Spring\Spring.skin" />
<Content Include="Config\Aspects.xml" />
<Content Include="Config\Log4Net.xml" />
<Content Include="Shared\MasterPage.master" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -166,10 +165,6 @@
<ItemGroup>
<Folder Include="App_Data\" />
</ItemGroup>
<ItemGroup>
<Content Include="Web.net30.config" />
<Content Include="Web.net40.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Expand Down Expand Up @@ -203,7 +198,4 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)Web.net40.config" "$(ProjectDir)Web.config" /Y</PostBuildEvent>
</PropertyGroup>
</Project>
18 changes: 2 additions & 16 deletions .../Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,12 @@
-->
<configuration>
<configSections>
<sectionGroup name="common">
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
</sectionGroup>
<sectionGroup name="spring">
<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
</sectionGroup>
<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
</configSections>
<common>
<logging>
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net1213">
<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
<!-- otherwise BasicConfigurer.Configure is used -->
<!-- log4net configuration file is specified with key configFile-->
<arg key="configType" value="FILE-WATCH"/>
<arg key="configFile" value="~/Config/Log4Net.xml"/>
</factoryAdapter>
</logging>
</common>
<spring>
<parsers>
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
Expand Down Expand Up @@ -57,7 +43,7 @@
<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
<!--<add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate21"/>-->
<!--Module that controls the conversations at the end of the request. Ends the Conversations in timeout and pause the conversations at the end of the request.-->
<add name="ConversationModule" type="Spring.Web.Conversation.HttpModule.ConversationModule, Spring.Web.Conversation.NHibernate32"/>
<add name="ConversationModule" type="Spring.Web.Conversation.HttpModule.ConversationModule, Spring.Web.Conversation.NHibernate5"/>
</httpModules>
<httpHandlers>
<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
Expand All @@ -76,7 +62,7 @@
<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
<!--<add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate21"/>-->
<!--Module that controls the conversations at the end of the request. Ends the Conversations in timeout and pause the conversations at the end of the request.-->
<add name="ConversationModule" type="Spring.Web.Conversation.HttpModule.ConversationModule, Spring.Web.Conversation.NHibernate32"/>
<add name="ConversationModule" type="Spring.Web.Conversation.HttpModule.ConversationModule, Spring.Web.Conversation.NHibernate5"/>
</modules>
<handlers>
<add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
Expand Down
87 changes: 0 additions & 87 deletions ...g/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Web.net30.config
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions ...g/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Web.net40.config
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...les/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!--Conversation for 'Default.aspx'-->
<!--"convDefault" will have only one functionality: trigger the release of other conversations when started (StartResumeConversation())-->
<object name="convDefault" type="Spring.Web.Conversation.WebConversationSpringState, Spring.Web.Conversation.NHibernate32" scope="session">
<object name="convDefault" type="Spring.Web.Conversation.WebConversationSpringState, Spring.Web.Conversation.NHibernate5" scope="session">
<property name="Id" value="convDefault"></property>
<property name="TimeOut" value="0"></property>
<property name="ConversationManager" ref="conversationManager"></property>
Expand Down Expand Up @@ -97,7 +97,7 @@

<!--Conversation for 'CustomerEditor.aspx', 'CustomerList.aspx', 'CustomerOrders.aspx', 'CustomerView.aspx', and 'FulfillmentResult.aspx'-->
<!--Important: If the application had other parties ("management employees" for example), they should use another conversation.-->
<object name="convCustomer" type="Spring.Web.Conversation.WebConversationSpringState, Spring.Web.Conversation.NHibernate32" scope="session">
<object name="convCustomer" type="Spring.Web.Conversation.WebConversationSpringState, Spring.Web.Conversation.NHibernate5" scope="session">
<property name="Id" value="convCustomer"></property>
<property name="TimeOut" value="0"></property>
<property name="ConversationManager" ref="conversationManager"></property>
Expand All @@ -108,7 +108,7 @@
</object>

<!--Conversation Manager-->
<object name="conversationManager" type="Spring.Web.Conversation.WebConversationManager, Spring.Web.Conversation.NHibernate32" scope="session">
<object name="conversationManager" type="Spring.Web.Conversation.WebConversationManager, Spring.Web.Conversation.NHibernate5" scope="session">
<property name="SessionFactoryName" value="NHibernateSessionFactory"/>
<property name="EndPaused" value="true"/>
</object>
Expand Down
57 changes: 0 additions & 57 deletions examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Config/Log4Net.xml
View file
Open in desktop

This file was deleted.

Loading
Loading