From 25029d3398e39dc1ac03577a36cc10908e309e58 Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Tue, 24 Dec 2013 10:05:07 +0200
Subject: [PATCH] fix Spring.Calculator example project

---
 .../Spring.Calculator.Web.2010.csproj             |  5 ++++-
 .../src/Spring.Calculator.Web/Web.config          | 15 +++++++++++++--
 src/Spring/CommonAssemblyInfo.cs                  |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
index 52503cd9..f1412cb4 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
@@ -50,7 +50,7 @@
       <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.Log4Net1211.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+      <HintPath>..\..\..\..\..\lib\Net\4.0\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop">
       <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
@@ -96,6 +96,9 @@
       <Name>Spring.Calculator.Services.2010</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
index 8b8e57a4..451d304a 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
@@ -13,7 +13,7 @@
   
   <common>
     <logging>
-      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net1211">
         <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL -->
         <!-- otherwise BasicConfigurer.Configure is used -->
         <!-- log4net configuration file is specified with key configFile -->
@@ -100,5 +100,16 @@
       <level value="INFO"/>
     </logger>
   </log4net>
-
+  
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules>
+      <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+    </modules>
+    <handlers>
+      <add name="SpringPageHandlerFactory" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+      <add name="SpringWebServiceHandlerFactory" verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
+      <add name="SpringContextMonitor" verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
+    </handlers>
+  </system.webServer>
 </configuration>
diff --git a/src/Spring/CommonAssemblyInfo.cs b/src/Spring/CommonAssemblyInfo.cs
index 90709a9a..2e55c315 100644
--- a/src/Spring/CommonAssemblyInfo.cs
+++ b/src/Spring/CommonAssemblyInfo.cs
@@ -31,7 +31,7 @@ using System.Reflection;
 //note that this #if #elif #endif contstruct requires NET_#_# values be checked in DESCENDING order to work properly
 // (e.g., add any new ones at the TOP of this construct!)
 
-#if NET_4_0
+#if NET_4_5
 [assembly: AssemblyVersion("2.0.0.45001")]
 #elif NET_4_0
 [assembly: AssemblyVersion("2.0.0.40001")]