From 963c462fcbe375052a2337c8ab97920c66d587d8 Mon Sep 17 00:00:00 2001
From: bbaia <brbaia@gmail.com>
Date: Fri, 3 Jun 2011 23:32:19 +0000
Subject: [PATCH] Clean up Calculator quick start

---
 .../Spring.Calculator.2008.sln                |  41 +-
 .../Spring.Calculator.2010.sln                |  65 +---
 .../src/Spring.Aspects/AssemblyInfo.cs        |  36 --
 .../Logging/CommonLoggingAroundAdvice.cs      |   2 +-
 .../Logging/ConsoleLoggingAroundAdvice.cs     |   2 +-
 .../Spring.Aspects/Spring.Aspects.2003.csproj |   5 -
 .../Spring.Aspects/Spring.Aspects.2005.csproj |   5 +-
 .../Spring.Aspects/Spring.Aspects.2008.csproj |  11 +-
 .../Spring.Aspects/Spring.Aspects.2010.csproj |  16 +-
 .../Spring.Calculator.ClientApp/App.config    |  28 +-
 .../AssemblyInfo.cs                           |  36 --
 .../Config/WebServices/calculatorService.wsdl | 351 ++++++++++++++++++
 .../Config/WebServices/webServices-aop.xml    |  20 +
 .../Config/WebServices/webServices.xml        |  18 +
 .../Spring.Calculator.ClientApp/Program.cs    |   2 +-
 .../Spring.Calculator.ClientApp.2003.csproj   |   5 -
 .../Spring.Calculator.ClientApp.2005.csproj   |   7 +-
 .../Spring.Calculator.ClientApp.2008.csproj   |  20 +-
 .../Spring.Calculator.ClientApp.2010.csproj   |  34 +-
 .../AssemblyInfo.cs                           |  43 ---
 .../Domain/DivisionResult.cs                  |   2 +-
 .../Interfaces/IAdvancedCalculator.cs         |   2 +-
 .../Interfaces/ICalculator.cs                 |   2 +-
 .../Spring.Calculator.Contract.2003.csproj    |   5 -
 .../Spring.Calculator.Contract.2005.csproj    |   7 +-
 .../Spring.Calculator.Contract.2008.csproj    |   7 +-
 .../Spring.Calculator.Contract.2010.csproj    |  10 +-
 .../App.config                                |  44 +--
 .../AssemblyInfo.cs                           |  36 --
 .../Config/services.xml                       |   2 +
 .../Program.cs                                |   2 +-
 ...ator.RegisterComponentServices.2003.csproj |  18 +-
 ...ator.RegisterComponentServices.2005.csproj |  14 +-
 ...ator.RegisterComponentServices.2008.csproj |  17 +-
 ...ator.RegisterComponentServices.2010.csproj |  36 +-
 .../Spring.Calculator.RemoteApp/App.config    |  45 ++-
 .../AssemblyInfo.cs                           |  36 --
 .../Spring.Calculator.RemoteApp/Program.cs    |   2 +-
 .../Spring.Calculator.RemoteApp.2003.csproj   |   5 -
 .../Spring.Calculator.RemoteApp.2005.csproj   |   7 +-
 .../Spring.Calculator.RemoteApp.2008.csproj   |  15 +-
 .../Spring.Calculator.RemoteApp.2010.csproj   |  24 +-
 .../AssemblyInfo.cs                           |  43 ---
 .../Services/AdvancedCalculator.cs            |   2 +-
 .../Services/Calculator.cs                    |   2 +-
 .../Spring.Calculator.Services.2003.csproj    |   5 -
 .../Spring.Calculator.Services.2005.csproj    |   9 +-
 .../Spring.Calculator.Services.2008.csproj    |  12 +-
 .../Spring.Calculator.Services.2010.csproj    |  12 +-
 .../AssemblyInfo.cs                           |  36 --
 .../Spring.Calculator.Web.2003.csproj         |   5 -
 .../Bin/antlr.runtime.dll.refresh             | Bin 102 -> 0 bytes
 .../src/Spring.Calculator.Web.2005/Web.config |  99 +++--
 .../Config/webServices-aop.xml                |  12 +
 .../Config/webServices.xml                    |  12 +
 .../src/Spring.Calculator.Web/Default.aspx    |  18 +
 .../Spring.Calculator.Web.2008.csproj         | 126 +++++++
 .../Spring.Calculator.Web.2010.csproj         | 117 ++++++
 .../src/Spring.Calculator.Web/Web.config      | 104 ++++++
 59 files changed, 1030 insertions(+), 669 deletions(-)
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/calculatorService.wsdl
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices-aop.xml
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices.xml
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/AssemblyInfo.cs
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/antlr.runtime.dll.refresh
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices-aop.xml
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices.xml
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Default.aspx
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
 create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config

diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln
index f44a7ba2..d1162d6a 100644
--- a/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln
@@ -18,26 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2008", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2008", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2008.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Calculator.Web.2005", "src\Spring.Calculator.Web.2005\", "{9697F719-BA0B-492E-ABAE-6132A8FCEC45}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "2.0"
-		ProjectReferences = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}|Spring.Aspects.dll;{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}|Spring.Calculator.Contract.dll;{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}|Spring.Calculator.Services.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.Calculator.Web.2005"
-		Debug.AspNetCompiler.PhysicalPath = "Spring.Calculator.Web.2005\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Calculator.Web.2005\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.Calculator.Web.2005"
-		Release.AspNetCompiler.PhysicalPath = "Spring.Calculator.Web.2005\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Calculator.Web.2005\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "1643"
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2008", "src\Spring.Calculator.Web\Spring.Calculator.Web.2008.csproj", "{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -109,16 +90,16 @@ Global
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|.NET.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|.NET.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|.NET.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|.NET.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln
index 286844c0..5358ddfd 100644
--- a/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln
@@ -18,30 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2010", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2010", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2010.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Calculator.Web.2005", "src\Spring.Calculator.Web.2005", "{9697F719-BA0B-492E-ABAE-6132A8FCEC45}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv2.0"
-		ProjectReferences = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}|Spring.Aspects.dll;{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}|Spring.Calculator.Contract.dll;{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}|Spring.Calculator.Services.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.Calculator.Web.2005"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Calculator.Web.2005\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Calculator.Web.2005\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.Calculator.Web.2005"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.Calculator.Web.2005\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Calculator.Web.2005\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "1643"
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2010", "..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2010", "..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2010", "src\Spring.Calculator.Web\Spring.Calculator.Web.2010.csproj", "{08E648D8-FD43-4459-B997-1095E50FFD24}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -113,36 +90,16 @@ Global
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|.NET.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|.NET.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|.NET.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|.NET.Build.0 = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{9697F719-BA0B-492E-ABAE-6132A8FCEC45}.Release|Mixed Platforms.Build.0 = Debug|.NET
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|.NET.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs
deleted file mode 100644
index 8e304fc5..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Aspect library")]
-[assembly: AssemblyDescription("Aspect library using Spring.Aop for examples")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs
index 2598c056..35113d36 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs
index 0e7b60ff..686e9e24 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2003.csproj
index 7f52c2e9..88a9fcbc 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2003.csproj
@@ -83,11 +83,6 @@
         </Build>
         <Files>
             <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Logging\CommonLoggingAroundAdvice.cs"
                     SubType = "Code"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2005.csproj
index 1dddd089..348af2be 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2005.csproj
@@ -59,7 +59,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0,STRONG</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -89,9 +89,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Logging\ConsoleLoggingAroundAdvice.cs" />
     <Compile Include="Logging\CommonLoggingAroundAdvice.cs" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
index 1dddd089..2fece33d 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,8 +11,7 @@
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>Spring.Aspects</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -28,6 +27,7 @@
     </UpgradeBackupLocation>
     <SignAssembly>false</SignAssembly>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -59,7 +59,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0,STRONG</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -89,9 +89,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Logging\ConsoleLoggingAroundAdvice.cs" />
     <Compile Include="Logging\CommonLoggingAroundAdvice.cs" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj
index 6b6e4048..1d84c0c1 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj
@@ -29,7 +29,7 @@
     </UpgradeBackupLocation>
     <SignAssembly>false</SignAssembly>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -45,6 +45,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -77,7 +78,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0,STRONG</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -95,22 +96,19 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Logging\ConsoleLoggingAroundAdvice.cs" />
     <Compile Include="Logging\CommonLoggingAroundAdvice.cs" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config
index db44fa9c..939f2f53 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
 
   <configSections>
     <sectionGroup name="common">
-      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
     </sectionGroup>  
     <sectionGroup name="spring">
-      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" />
-      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
-      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
+      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
     </sectionGroup>
   </configSections>
 
   <common>
     <logging>
       <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
-        <arg key="level" value="ALL" />
+        <arg key="level" value="ALL"/>
       </factoryAdapter>
     </logging>
   </common>
@@ -23,18 +23,18 @@
   <spring>
 
     <parsers>
-      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services" />
+      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services"/>
     </parsers>
 
     <context>
-      <resource uri="config://spring/objects" />
+      <resource uri="config://spring/objects"/>
 
       <!-- Only one at a time ! -->
 
       <!-- ================================== -->
       <!-- In process (local) implementations -->
       <!-- ================================== -->
-      <!-- resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.InProcess/inProcess.xml" / -->
+      <resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.InProcess/inProcess.xml" /> 
 
       <!-- ======================== -->
       <!-- Remoting implementations -->
@@ -59,12 +59,16 @@
       <!-- Make sure 'http://localhost:1643/Spring.Calculator.Web.2005/' web application is running -->
       <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2005/webServices.xml" />-->
       <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2005/webServices-aop.xml" />-->
+      <!-- Web.Services VS2008/VS2010 -->
+      <!-- Make sure 'http://localhost:43085/' web application is running -->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices/webServices.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices/webServices-aop.xml" />-->
 
       <!-- ================================= -->
       <!-- EnterpriseService implementations -->
       <!-- ================================= -->
       <!-- Make sure you register components with 'RegisterComponentServices' console application. -->
-      <resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.EnterpriseServices/enterpriseServices.xml" />
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.EnterpriseServices/enterpriseServices.xml"/>-->
 
     </context>
 
@@ -72,11 +76,11 @@
       <description>Definitions of objects to be exported.</description>
 
       <object id="ConsoleLoggingAroundAdvice" type="Spring.Aspects.Logging.ConsoleLoggingAroundAdvice, Spring.Aspects">
-        <property name="ForegroundColor" value="Red" />
+        <property name="ForegroundColor" value="Red"/>
       </object>
 
     </objects>
 
   </spring>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs
deleted file mode 100644
index 8975f419..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator client application")]
-[assembly: AssemblyDescription("Client application for Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/calculatorService.wsdl b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/calculatorService.wsdl
new file mode 100644
index 00000000..be2fb66a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/calculatorService.wsdl
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://SpringCalculator/WebServices" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://SpringCalculator/WebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Spring Calculator Web Services</wsdl:documentation>
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://SpringCalculator/WebServices">
+      <s:element name="Add">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="n1" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="n2" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="AddResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="AddResult" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="Substract">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="n1" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="n2" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SubstractResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="SubstractResult" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="Divide">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="n1" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="n2" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="DivideResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="DivideResult" type="tns:DivisionResult" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="DivisionResult">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="Quotient" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="Rest" type="s:int" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="Multiply">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="n1" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="n2" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="MultiplyResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="MultiplyResult" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="GetMemory">
+        <s:complexType />
+      </s:element>
+      <s:element name="GetMemoryResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="GetMemoryResult" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SetMemory">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="memoryValue" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SetMemoryResponse">
+        <s:complexType />
+      </s:element>
+      <s:element name="MemoryClear">
+        <s:complexType />
+      </s:element>
+      <s:element name="MemoryClearResponse">
+        <s:complexType />
+      </s:element>
+      <s:element name="MemoryAdd">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="num" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="MemoryAddResponse">
+        <s:complexType />
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="AddSoapIn">
+    <wsdl:part name="parameters" element="tns:Add" />
+  </wsdl:message>
+  <wsdl:message name="AddSoapOut">
+    <wsdl:part name="parameters" element="tns:AddResponse" />
+  </wsdl:message>
+  <wsdl:message name="SubstractSoapIn">
+    <wsdl:part name="parameters" element="tns:Substract" />
+  </wsdl:message>
+  <wsdl:message name="SubstractSoapOut">
+    <wsdl:part name="parameters" element="tns:SubstractResponse" />
+  </wsdl:message>
+  <wsdl:message name="DivideSoapIn">
+    <wsdl:part name="parameters" element="tns:Divide" />
+  </wsdl:message>
+  <wsdl:message name="DivideSoapOut">
+    <wsdl:part name="parameters" element="tns:DivideResponse" />
+  </wsdl:message>
+  <wsdl:message name="MultiplySoapIn">
+    <wsdl:part name="parameters" element="tns:Multiply" />
+  </wsdl:message>
+  <wsdl:message name="MultiplySoapOut">
+    <wsdl:part name="parameters" element="tns:MultiplyResponse" />
+  </wsdl:message>
+  <wsdl:message name="GetMemorySoapIn">
+    <wsdl:part name="parameters" element="tns:GetMemory" />
+  </wsdl:message>
+  <wsdl:message name="GetMemorySoapOut">
+    <wsdl:part name="parameters" element="tns:GetMemoryResponse" />
+  </wsdl:message>
+  <wsdl:message name="SetMemorySoapIn">
+    <wsdl:part name="parameters" element="tns:SetMemory" />
+  </wsdl:message>
+  <wsdl:message name="SetMemorySoapOut">
+    <wsdl:part name="parameters" element="tns:SetMemoryResponse" />
+  </wsdl:message>
+  <wsdl:message name="MemoryClearSoapIn">
+    <wsdl:part name="parameters" element="tns:MemoryClear" />
+  </wsdl:message>
+  <wsdl:message name="MemoryClearSoapOut">
+    <wsdl:part name="parameters" element="tns:MemoryClearResponse" />
+  </wsdl:message>
+  <wsdl:message name="MemoryAddSoapIn">
+    <wsdl:part name="parameters" element="tns:MemoryAdd" />
+  </wsdl:message>
+  <wsdl:message name="MemoryAddSoapOut">
+    <wsdl:part name="parameters" element="tns:MemoryAddResponse" />
+  </wsdl:message>
+  <wsdl:portType name="calculatorServiceSoap">
+    <wsdl:operation name="Add">
+      <wsdl:input message="tns:AddSoapIn" />
+      <wsdl:output message="tns:AddSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Substract">
+      <wsdl:input message="tns:SubstractSoapIn" />
+      <wsdl:output message="tns:SubstractSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Divide">
+      <wsdl:input message="tns:DivideSoapIn" />
+      <wsdl:output message="tns:DivideSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Multiply">
+      <wsdl:input message="tns:MultiplySoapIn" />
+      <wsdl:output message="tns:MultiplySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="GetMemory">
+      <wsdl:input message="tns:GetMemorySoapIn" />
+      <wsdl:output message="tns:GetMemorySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SetMemory">
+      <wsdl:input message="tns:SetMemorySoapIn" />
+      <wsdl:output message="tns:SetMemorySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="MemoryClear">
+      <wsdl:input message="tns:MemoryClearSoapIn" />
+      <wsdl:output message="tns:MemoryClearSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="MemoryAdd">
+      <wsdl:input message="tns:MemoryAddSoapIn" />
+      <wsdl:output message="tns:MemoryAddSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="calculatorServiceSoap" type="tns:calculatorServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Add">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/Add" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Substract">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/Substract" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Divide">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/Divide" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Multiply">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/Multiply" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="GetMemory">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/GetMemory" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SetMemory">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/SetMemory" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="MemoryClear">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/MemoryClear" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="MemoryAdd">
+      <soap:operation soapAction="http://SpringCalculator/WebServices/MemoryAdd" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="calculatorServiceSoap12" type="tns:calculatorServiceSoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Add">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/Add" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Substract">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/Substract" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Divide">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/Divide" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Multiply">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/Multiply" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="GetMemory">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/GetMemory" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SetMemory">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/SetMemory" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="MemoryClear">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/MemoryClear" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="MemoryAdd">
+      <soap12:operation soapAction="http://SpringCalculator/WebServices/MemoryAdd" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="calculatorService">
+    <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Spring Calculator Web Services</wsdl:documentation>
+    <wsdl:port name="calculatorServiceSoap" binding="tns:calculatorServiceSoap">
+      <soap:address location="http://localhost:1643/Spring.Calculator.Web.2005/calculatorService.asmx" />
+    </wsdl:port>
+    <wsdl:port name="calculatorServiceSoap12" binding="tns:calculatorServiceSoap12">
+      <soap12:address location="http://localhost:1643/Spring.Calculator.Web.2005/calculatorService.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices-aop.xml
new file mode 100644
index 00000000..23deba8b
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices-aop.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>webServices-aop</description>
+		
+	<object id="webCalculatorService" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services"> 
+		<property name="ServiceUri" value="http://localhost:43085/calculatorServiceWeaved.asmx"/> 
+		<property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract"/> 
+	</object>
+	
+	<object id="calculatorService" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+		<property name="target" ref="webCalculatorService"/>
+		<property name="interceptorNames">
+			<list>
+				<value>ConsoleLoggingAroundAdvice</value>
+			</list>
+		</property>
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices.xml
new file mode 100644
index 00000000..90ba4ea5
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices/webServices.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>webServices</description>
+			
+	<object id="calculatorService" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services">
+    <!--<property name="ServiceUri" value="http://localhost:43085/calculatorService.asmx"/>-->
+    <property name="ServiceUri" value="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2005/calculatorService.wsdl"/>
+    <property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract"/>
+    <!-- Dependency injection on Factory's product : the proxy instance of type SoapHttpClientProtocol -->
+    <property name="ProductTemplate">
+      <object>
+        <property name="Timeout" value="10000" /><!-- 10s -->
+      </object>
+    </property>
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Program.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Program.cs
index 5c338c69..db886f5e 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Program.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Program.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2003.csproj
index 5db2e3ab..4f7fdb95 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2003.csproj
@@ -112,11 +112,6 @@
                     RelPath = "App.config"
                     BuildAction = "None"
                 />
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Program.cs"
                     SubType = "Code"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj
index b4ba4de0..8a9e51e2 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj
@@ -35,7 +35,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -59,7 +59,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -112,9 +112,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
index 48056ced..45e5088f 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F202BB75-CEFD-400B-9CD3-0914F466EBF5}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -35,7 +36,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -59,7 +60,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -99,9 +100,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>system</Name>
@@ -112,9 +113,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <EmbeddedResource Include="Config\WebServices\calculatorService.wsdl" />
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -128,11 +127,10 @@
     <EmbeddedResource Include="Config\Remoting\saoSingleCall.xml" />
     <EmbeddedResource Include="Config\Remoting\saoSingleton-aop.xml" />
     <EmbeddedResource Include="Config\Remoting\saoSingleton.xml" />
-    <EmbeddedResource Include="Config\WebServices2005\webServices-aop.xml" />
-    <EmbeddedResource Include="Config\WebServices2005\webServices.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Config\WebServices2005\calculatorService.wsdl" />
+    <EmbeddedResource Include="Config\WebServices\webServices-aop.xml" />
+    <EmbeddedResource Include="Config\WebServices\webServices.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj
index f06fb73b..593a51f1 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj
@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -52,7 +53,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -77,7 +78,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -95,17 +96,17 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>system</Name>
@@ -116,9 +117,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -132,11 +130,7 @@
     <EmbeddedResource Include="Config\Remoting\saoSingleCall.xml" />
     <EmbeddedResource Include="Config\Remoting\saoSingleton-aop.xml" />
     <EmbeddedResource Include="Config\Remoting\saoSingleton.xml" />
-    <EmbeddedResource Include="Config\WebServices2005\webServices-aop.xml" />
-    <EmbeddedResource Include="Config\WebServices2005\webServices.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\WebServices2005\calculatorService.wsdl" />
+    <EmbeddedResource Include="Config\WebServices\calculatorService.wsdl" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -169,6 +163,12 @@
       <Name>Spring.Calculator.Services.2010</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Config\WebServices\webServices-aop.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Config\WebServices\webServices.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs
deleted file mode 100644
index 9558ea1c..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator contract")]
-[assembly: AssemblyDescription("Contract for the Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2008 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
-
-#if STRONG
-[assembly: AssemblyDelaySign(false)]
-#if !NET_2_0
-[assembly: AssemblyKeyFile(@"Spring.Calculator.snk")]
-#endif
-#endif
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs
index f12152e4..9e462c60 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/IAdvancedCalculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/IAdvancedCalculator.cs
index 8d2c3acc..415cd7f2 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/IAdvancedCalculator.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/IAdvancedCalculator.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/ICalculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/ICalculator.cs
index 5cc3dac6..c9445658 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/ICalculator.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/ICalculator.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2003.csproj
index 45d65c3d..3bbfac93 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2003.csproj
@@ -67,11 +67,6 @@
         </Build>
         <Files>
             <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Domain\DivisionResult.cs"
                     SubType = "Code"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2005.csproj
index 5db25046..c78adb28 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2005.csproj
@@ -35,7 +35,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +58,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -75,9 +75,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Domain\DivisionResult.cs" />
     <Compile Include="Interfaces\IAdvancedCalculator.cs">
       <SubType>Code</SubType>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj
index 5db25046..c389907f 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -35,7 +36,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +59,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj
index fd6f0872..7694aa77 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj
@@ -28,7 +28,7 @@
     </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -52,7 +53,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -76,7 +77,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -94,9 +95,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Domain\DivisionResult.cs" />
     <Compile Include="Interfaces\IAdvancedCalculator.cs">
       <SubType>Code</SubType>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config
index 47949c8c..a017c5d1 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
 
     <configSections>
         <sectionGroup name="common">
-            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
         </sectionGroup>
         <sectionGroup name="spring">
-            <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" />
-            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
+            <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
+            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
         </sectionGroup>
     </configSections>
 
     <common>
         <logging>
             <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
-                <arg key="level" value="ALL" />
+                <arg key="level" value="ALL"/>
             </factoryAdapter>
         </logging>
     </common>
 
     <spring>
         <context>
-            <resource uri="Config/services.xml" />
-            <resource uri="config://spring/objects" />
+            <resource uri="Config/services.xml"/>
+            <resource uri="config://spring/objects"/>
         </context>
 
         <objects xmlns="http://www.springframework.net">
@@ -31,17 +31,17 @@
 
             <!-- Define the component for exporting 'calculatorService' -->
             <object id="calculatorComponent" type="Spring.EnterpriseServices.ServicedComponentExporter, Spring.Services">
-                <property name="TargetName" value="calculatorService" />
+                <property name="TargetName" value="calculatorService"/>
                 <property name="TypeAttributes">
                     <list>
-                        <object type="System.EnterpriseServices.TransactionAttribute, System.EnterpriseServices" />
+                        <object type="System.EnterpriseServices.TransactionAttribute, System.EnterpriseServices"/>
                     </list>
                 </property>
                 <property name="MemberAttributes">
                     <dictionary>
                         <entry key="*">
                             <list>
-                                <object type="System.EnterpriseServices.AutoCompleteAttribute, System.EnterpriseServices" />
+                                <object type="System.EnterpriseServices.AutoCompleteAttribute, System.EnterpriseServices"/>
                             </list>
                         </entry>
                     </dictionary>
@@ -50,14 +50,14 @@
 
             <!-- Define the component for exporting 'simpleCalculatorService' -->
             <object id="simpleCalculatorComponent" type="Spring.EnterpriseServices.ServicedComponentExporter, Spring.Services">
-                <property name="TargetName" value="simpleCalculatorService" />
+                <property name="TargetName" value="simpleCalculatorService"/>
             </object>
 
             <!-- Export components into assembly and autoregister with COM+ -->
             <object type="Spring.EnterpriseServices.EnterpriseServicesExporter, Spring.Services">
                 
                 <!-- assembly name to generate - will generate 'Spring.Calculator.EnterpriseServices.dll'  -->
-                <property name="Assembly" value="Spring.Calculator.EnterpriseServices" />
+                <property name="Assembly" value="Spring.Calculator.EnterpriseServices"/>
                 
                 <!-- 
                 use Spring's ContextRegistry for managing services. If true, requires a file  
@@ -65,15 +65,15 @@
                 'Spring.Calculator.EnterpriseServices.exe.config' (for 'Server')                
                 containing a <spring/context /> section placed next to the generated assembly.
                 -->
-                <property name="UseSpring" value="true" />
-                <property name="ApplicationName" value="Spring Calculator Application" />
+                <property name="UseSpring" value="true"/>
+                <property name="ApplicationName" value="Spring Calculator Application"/>
                 <!--<property name="ActivationMode" value="Library" />-->
-                <property name="ActivationMode" value="Server" />
-                <property name="Description" value="Spring Calculator application" />
+                <property name="ActivationMode" value="Server"/>
+                <property name="Description" value="Spring Calculator application"/>
                 <property name="Components">
                     <list>
-                        <ref object="calculatorComponent" />
-                        <ref object="simpleCalculatorComponent" />
+                        <ref object="calculatorComponent"/>
+                        <ref object="simpleCalculatorComponent"/>
                     </list>
                 </property>
                 <property name="AccessControl">
@@ -83,7 +83,7 @@
                         </property>
                     </object>
                 </property>
-<!--
+                <!--
                 <property name="AccessControl">
 	                <object type="System.EnterpriseServices.ApplicationAccessControlAttribute, System.EnterpriseServices">
 		                <property name="Value">
@@ -101,10 +101,10 @@
 		                <value>Manager : Administrator role</value>
 	                </list>
                 </property>
--->
+                -->
             </object>
 
         </objects>
     </spring>
-
-</configuration>
\ No newline at end of file
+  
+</configuration>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs
deleted file mode 100644
index 87cf23ea..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator COM+ registry service")]
-[assembly: AssemblyDescription("COM+ registry service for Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml
index cff4a19b..03acba0b 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml
@@ -3,6 +3,7 @@
     <description>Definitions of objects to be registered.</description>
 
     <!-- Aspect -->
+    <!--
     <object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
         <property name="Level" value="Debug"/>
     </object>
@@ -20,6 +21,7 @@
             </list>
         </property>
     </object>
+    -->
 
     <!-- Service -->
     <object id="simpleCalculatorService" type="Spring.Calculator.Services.Calculator, Spring.Calculator.Services" />
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs
index 2d207fe0..288dc823 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj
index cd7f756a..3a49cdb0 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj
@@ -17,7 +17,7 @@
                 DelaySign = "false"
                 OutputType = "Exe"
                 PreBuildEvent = ""
-                PostBuildEvent = "xcopy $(ProjectDir)Spring.Calculator.EnterpriseServices.dll.spring-context.xml $(TargetDir) /Y /F&#xd;&#xa;xcopy $(ProjectDir)Config\*.* $(TargetDir)Config /S /Y /F /I"
+                PostBuildEvent = "xcopy $(ProjectDir)Spring.Calculator.EnterpriseServices.* $(TargetDir) /Y /F&#xd;&#xa;xcopy $(ProjectDir)Config\*.* $(TargetDir)Config /S /Y /F /I"
                 RootNamespace = "Spring.Calculator.RegisterComponentServices"
                 RunPostBuildEvent = "Always"
                 StartupObject = ""
@@ -84,11 +84,6 @@
                     AssemblyName = "Spring.Core"
                     HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
                 />
-                <Reference
-                    Name = "Spring.Aspects.2003"
-                    Project = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
             </References>
         </Build>
         <Files>
@@ -97,18 +92,17 @@
                     RelPath = "App.config"
                     BuildAction = "None"
                 />
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Program.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Spring.Calculator.EnterpriseServices.dll.spring-context.xml"
+                    RelPath = "Spring.Calculator.EnterpriseServices.dll.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Spring.Calculator.EnterpriseServices.exe.config"
                     BuildAction = "Content"
                 />
                 <File
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2005.csproj
index d8bcace9..99b453ca 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2005.csproj
@@ -35,7 +35,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -77,18 +77,13 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <None Include="Spring.Calculator.EnterpriseServices.dll.config" />
+    <None Include="Spring.Calculator.EnterpriseServices.exe.config" />
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2005.csproj">
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Name>Spring.Aspects.2005</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2005.csproj">
       <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
       <Name>Spring.Calculator.Contract.2005</Name>
@@ -112,9 +107,6 @@
     <Content Include="Config\services.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Spring.Calculator.EnterpriseServices.dll.spring-context.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
index 7d49cd3c..323bb22b 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,8 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkSubset>Full</TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -35,7 +37,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -84,18 +86,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Spring.Calculator.RegisterComponentServices.build" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2008.csproj">
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Name>Spring.Aspects.2008</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
       <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
       <Name>Spring.Calculator.Contract.2008</Name>
@@ -110,9 +105,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj
index 6bb70082..14fb199d 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj
@@ -28,7 +28,9 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -41,10 +43,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -53,7 +53,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -97,23 +97,18 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
     <None Include="Spring.Calculator.EnterpriseServices.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Spring.Calculator.EnterpriseServices.exe.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\services.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Spring.Calculator.EnterpriseServices.dll.spring-context.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -133,18 +128,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj">
-      <Project>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Project>
-      <Name>Spring.Services.2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2010.csproj">
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Name>Spring.Aspects.2010</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj">
       <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
       <Name>Spring.Calculator.Contract.2010</Name>
@@ -154,6 +137,15 @@
       <Name>Spring.Calculator.Services.2010</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services, Version=0.0.0.20709, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config
index 3d9b3652..3b995536 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config
@@ -1,35 +1,34 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
 
   <configSections>
     <sectionGroup name="spring">
-      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" />
-      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
-      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
+      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
     </sectionGroup>
   </configSections>
 
   <spring>
 
     <parsers>
-      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services" />
+      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services"/>
     </parsers>
 
     <context>
-      <resource uri="config://spring/objects" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/cao.xml" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/cao-aop.xml" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleCall.xml" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleCall-aop.xml" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleton.xml" />
-      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleton-aop.xml" />
+      <resource uri="config://spring/objects"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/cao.xml"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/cao-aop.xml"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleCall.xml"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleCall-aop.xml"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleton.xml"/>
+      <resource uri="assembly://Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.Config/saoSingleton-aop.xml"/>
     </context>
 
-    <objects xmlns="http://www.springframework.net"
-				     xmlns:r="http://www.springframework.net/remoting">
+    <objects xmlns="http://www.springframework.net" xmlns:r="http://www.springframework.net/remoting">
       <description>Definitions of objects to be exported.</description>
 
-      <r:configurer filename="Spring.Calculator.RemoteApp.exe.config" />
+      <r:configurer filename="Spring.Calculator.RemoteApp.exe.config"/>
 
       <!--
 				Old fashion way without remoting config parser...
@@ -41,17 +40,17 @@
       <!-- Aspect -->
 
       <object id="ConsoleLoggingAroundAdvice" type="Spring.Aspects.Logging.ConsoleLoggingAroundAdvice, Spring.Aspects">
-        <property name="ForegroundColor" value="Red" />
+        <property name="ForegroundColor" value="Red"/>
       </object>
 
       <!-- Singleton -->
 
       <object id="singletonCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services">
-        <constructor-arg type="int" value="217" />
+        <constructor-arg type="int" value="217"/>
       </object>
 
       <object id="singletonCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
-        <property name="target" ref="singletonCalculator" />
+        <property name="target" ref="singletonCalculator"/>
         <property name="interceptorNames">
           <list>
             <value>ConsoleLoggingAroundAdvice</value>
@@ -62,13 +61,13 @@
       <!-- Prototype -->
 
       <object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" singleton="false">
-        <constructor-arg type="int" value="217" />
+        <constructor-arg type="int" value="217"/>
       </object>
 
       <object id="prototypeCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
         <property name="targetSource">
           <object type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop">
-            <property name="TargetObjectName" value="prototypeCalculator" />
+            <property name="TargetObjectName" value="prototypeCalculator"/>
           </object>
         </property>
         <property name="interceptorNames">
@@ -85,9 +84,9 @@
   <system.runtime.remoting>
     <application>
       <channels>
-        <channel ref="tcp" port="8005" />
+        <channel ref="tcp" port="8005"/>
       </channels>
     </application>
   </system.runtime.remoting>
-
-</configuration>
\ No newline at end of file
+  
+</configuration>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs
deleted file mode 100644
index 6b1e3d0a..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator remote application")]
-[assembly: AssemblyDescription("Remote application for Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Program.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Program.cs
index 4bc4ebda..c2869159 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Program.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Program.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2006 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2003.csproj
index 0f7ccd91..3e9cf573 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2003.csproj
@@ -107,11 +107,6 @@
                     RelPath = "App.config"
                     BuildAction = "None"
                 />
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Program.cs"
                     SubType = "Code"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2005.csproj
index 956d945b..b5d13936 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2005.csproj
@@ -35,7 +35,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +58,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -93,9 +93,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
index 24e054f7..b5bb5783 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,8 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkSubset>Full</TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -35,7 +37,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +60,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -83,9 +85,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -93,9 +95,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj
index 5719c2e8..e877edd2 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj
@@ -28,7 +28,9 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -41,7 +43,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -52,7 +53,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -76,7 +77,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -94,17 +95,17 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Services, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Services, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -112,9 +113,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs
deleted file mode 100644
index e556b1d8..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator services")]
-[assembly: AssemblyDescription("Services for the Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
-
-#if STRONG
-[assembly: AssemblyDelaySign(false)]
-#if !NET_2_0
-[assembly: AssemblyKeyFile(@"Spring.Calculator.snk")]
-#endif
-#endif
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs
index addb2ac0..2515fdc8 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2008 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs
index 8481e95b..3cc35efa 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2008 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj
index 770667cf..879aab48 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj
@@ -73,11 +73,6 @@
         </Build>
         <Files>
             <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Services\AdvancedCalculator.cs"
                     SubType = "Code"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj
index 557e06f8..5c9c1e3a 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj
@@ -25,7 +25,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,7 +35,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +58,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -75,9 +75,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Services\AdvancedCalculator.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj
index 1e56a074..33c318c6 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -25,8 +25,9 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -35,7 +36,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -58,7 +59,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -75,9 +76,6 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Services\AdvancedCalculator.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj
index 19fa776f..f210c1c7 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj
@@ -26,9 +26,9 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -44,6 +44,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -52,7 +53,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
@@ -76,7 +77,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -94,9 +95,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Services\AdvancedCalculator.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/AssemblyInfo.cs
deleted file mode 100644
index 383a480c..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring Calculator Web application")]
-[assembly: AssemblyDescription("C Web application for Spring Calculator example")]
-[assembly: AssemblyVersion("1.0.0.0")]
-
-#if !NET_2_0
-[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
-#else
-[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
-#endif
-[assembly: AssemblyCompany("http://www.springframework.net")]
-[assembly: AssemblyProduct("Spring.NET Framework")]
-[assembly: AssemblyCopyright("Copyright 2002-2006 Spring.NET Framework Team.")]
-[assembly: AssemblyTrademark("Apache License, Version 2.0")]
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj
index 37087a4e..16228b11 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj
@@ -123,11 +123,6 @@
         </Build>
         <Files>
             <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Default.aspx"
                     BuildAction = "Content"
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/antlr.runtime.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/antlr.runtime.dll.refresh
deleted file mode 100644
index cdcfe3287f1451340f95943a416934bb14b0c04b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmZvSK?;B{3<T#zL41!Fiz0>EL#f|y9q$s7-OcPAL9n_1H<79G%1KvOdy9IQ6Azbu
Smv#zG*8F`bbK3}e#d!hK&l1`I

diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config
index 8422cda5..42446978 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config
@@ -1,51 +1,40 @@
 <?xml version="1.0"?>
 <configuration>
-  
 	<configSections>
 		<sectionGroup name="common">
-			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+			<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="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
 		</sectionGroup>
 		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
 	</configSections>
-
-  <common>
-    <logging>
-      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
-        <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL -->
-        <!-- otherwise BasicConfigurer.Configure is used -->
-        <!-- log4net configuration file is specified with key configFile -->
-        <arg key="configType" value="INLINE" />
-      </factoryAdapter>
-    </logging>
-  </common>
-  
+	<common>
+		<logging>
+			<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+				<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL -->
+				<!-- otherwise BasicConfigurer.Configure is used -->
+				<!-- log4net configuration file is specified with key configFile -->
+				<arg key="configType" value="INLINE"/>
+			</factoryAdapter>
+		</logging>
+	</common>
 	<spring>
-    
 		<context>
 			<resource uri="config://spring/objects"/>
 			<resource uri="~/Config/webServices.xml"/>
 			<resource uri="~/Config/webServices-aop.xml"/>
 		</context>
-    
 		<objects xmlns="http://www.springframework.net">
 			<description>Definitions of objects to be exported.</description>
-			
-      <!-- Aspect -->
-      
-      <object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
+			<!-- Aspect -->
+			<object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
 				<property name="Level" value="Debug"/>
 			</object>
-      
-      <!-- Service -->
-			
-      <object id="calculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"/>
-			
-      <object id="calculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+			<!-- Service -->
+			<object id="calculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"/>
+			<object id="calculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
 				<property name="target" ref="calculator"/>
 				<property name="interceptorNames">
 					<list>
@@ -53,29 +42,34 @@
 					</list>
 				</property>
 			</object>
-		
-    </objects>
-	
-  </spring>
-	
-  <system.web>
+		</objects>
+	</spring>
+	<system.web>
 		<httpHandlers>
 			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
 		</httpHandlers>
 		<httpModules>
 			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
 		</httpModules>
-    <compilation debug="true"/>
-    <customErrors mode="RemoteOnly"/>
-    <authentication mode="Windows"/>
-    <authorization>
-      <allow users="*"/>
-    </authorization>
-    <trace enabled="false" requestLimit="10" pageOutput="true" traceMode="SortByTime" localOnly="true"/>
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20"/>
-    <globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
-  </system.web>
-  
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.EnterpriseServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation>
+		<customErrors mode="RemoteOnly"/>
+		<authentication mode="Windows"/>
+		<authorization>
+			<allow users="*"/>
+		</authorization>
+		<trace enabled="false" requestLimit="10" pageOutput="true" traceMode="SortByTime" localOnly="true"/>
+		<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20"/>
+		<globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
+	</system.web>
 	<log4net>
 		<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
 			<file value="Logs/log.txt"/>
@@ -98,14 +92,13 @@
 		<logger name="Spring.Aspects">
 			<level value="DEBUG"/>
 		</logger>
-    <!-- Set logging for Spring.Calculator -->
-    <logger name="Spring.Calculator">
-      <level value="DEBUG"/>
-    </logger>
-    <!-- Set logging for Spring -->
-    <logger name="Spring">
-      <level value="INFO"/>
-    </logger>
+		<!-- Set logging for Spring.Calculator -->
+		<logger name="Spring.Calculator">
+			<level value="DEBUG"/>
+		</logger>
+		<!-- Set logging for Spring -->
+		<logger name="Spring">
+			<level value="INFO"/>
+		</logger>
 	</log4net>
-  
 </configuration>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices-aop.xml
new file mode 100644
index 00000000..22617648
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices-aop.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>webServices-aop</description>
+	
+	<object id="calculatorServiceWeaved" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
+		<property name="TargetName" value="calculatorWeaved" />
+		<property name="Namespace" value="http://SpringCalculator/WebServices" />
+		<property name="Description" value="Spring Calculator Web Services" />
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices.xml
new file mode 100644
index 00000000..a9306898
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Config/webServices.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>webServices</description>
+			
+	<object id="calculatorService" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
+		<property name="TargetName" value="calculator" />
+		<property name="Namespace" value="http://SpringCalculator/WebServices" />
+		<property name="Description" value="Spring Calculator Web Services" />
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Default.aspx b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Default.aspx
new file mode 100644
index 00000000..ba146152
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Default.aspx
@@ -0,0 +1,18 @@
+<%@ Page %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Web Services</title>
+</head>
+<body>
+	<table width="100%" height="100%" align="center" valign="middle">
+		<tr>
+			<td align="center">
+				<h2><a href="calculatorService.asmx">CalculatorService</a></h2>
+				<br />
+				<h2><a href="calculatorServiceWeaved.asmx">CalculatorServiceWeaved</a></h2>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
new file mode 100644
index 00000000..14f2bd7b
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
@@ -0,0 +1,126 @@
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <AssemblyName>Spring.Calculator.Web</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config\webServices-aop.xml" />
+    <Content Include="Config\webServices.xml" />
+    <Content Include="Default.aspx" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2008.csproj">
+      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
+      <Name>Spring.Aspects.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
+      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
+      <Name>Spring.Calculator.Contract.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj">
+      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
+      <Name>Spring.Calculator.Services.2008</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>43085</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
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
new file mode 100644
index 00000000..fc393248
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{08E648D8-FD43-4459-B997-1095E50FFD24}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <AssemblyName>Spring.Calculator.Web</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <UseIISExpress>false</UseIISExpress>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging.Log4Net">
+      <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config\webServices-aop.xml" />
+    <Content Include="Config\webServices.xml" />
+    <Content Include="Default.aspx" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2010.csproj">
+      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
+      <Name>Spring.Aspects.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj">
+      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
+      <Name>Spring.Calculator.Contract.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj">
+      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
+      <Name>Spring.Calculator.Services.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>43085</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
new file mode 100644
index 00000000..8b8e57a4
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<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="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+    </sectionGroup>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+  </configSections>
+  
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+        <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL -->
+        <!-- otherwise BasicConfigurer.Configure is used -->
+        <!-- log4net configuration file is specified with key configFile -->
+        <arg key="configType" value="INLINE"/>
+      </factoryAdapter>
+    </logging>
+  </common>
+  
+  <spring>
+    
+    <context>
+      <resource uri="config://spring/objects"/>
+      <resource uri="~/Config/webServices.xml"/>
+      <resource uri="~/Config/webServices-aop.xml"/>
+    </context>
+    
+    <objects xmlns="http://www.springframework.net">
+      <description>Definitions of objects to be exported.</description>
+      
+      <!-- Aspect -->
+      <object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
+        <property name="Level" value="Debug"/>
+      </object>
+      
+      <!-- Service -->
+      <object id="calculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"/>
+      <object id="calculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        <property name="target" ref="calculator"/>
+        <property name="interceptorNames">
+          <list>
+            <value>CommonLoggingAroundAdvice</value>
+          </list>
+        </property>
+      </object>
+    </objects>
+    
+  </spring>
+  
+  <system.web>
+    <httpHandlers>
+      <add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
+    </httpHandlers>
+    <httpModules>
+      <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+    </httpModules>
+    <compilation debug="true"/>
+    <customErrors mode="RemoteOnly"/>
+    <authentication mode="Windows"/>
+    <authorization>
+      <allow users="*"/>
+    </authorization>
+    <trace enabled="false" requestLimit="10" pageOutput="true" traceMode="SortByTime" localOnly="true"/>
+    <globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
+  </system.web>
+  
+  <log4net>
+    <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="Logs/log.txt"/>
+      <appendToFile value="true"/>
+      <rollingStyle value="Size"/>
+      <maxSizeRollBackups value="10"/>
+      <maximumFileSize value="100KB"/>
+      <staticLogFileName value="true"/>
+      <lockingModel type="log4net.Appender.RollingFileAppender+MinimalLock"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%-5level] %logger - %message%newline"/>
+      </layout>
+    </appender>
+    <!-- Set default logging level -->
+    <root>
+      <level value="DEBUG"/>
+      <appender-ref ref="RollingFileAppender"/>
+    </root>
+    <!-- Set logging for Spring.Aspects -->
+    <logger name="Spring.Aspects">
+      <level value="DEBUG"/>
+    </logger>
+    <!-- Set logging for Spring.Calculator -->
+    <logger name="Spring.Calculator">
+      <level value="DEBUG"/>
+    </logger>
+    <!-- Set logging for Spring -->
+    <logger name="Spring">
+      <level value="INFO"/>
+    </logger>
+  </log4net>
+
+</configuration>